diff --git a/bazaar/MAPIEx/MAPIAppointment.cpp b/bazaar/MAPIEx/MAPIAppointment.cpp
index f25ea7050..4ba424b33 100644
--- a/bazaar/MAPIEx/MAPIAppointment.cpp
+++ b/bazaar/MAPIEx/MAPIAppointment.cpp
@@ -47,22 +47,21 @@ bool MAPIAppointment::GetPropertyString(ULONG ulProperty, String& strProperty, b
 	return m_pMAPI->GetPOOM()->GetProperty(m_pAppointment,ulProperty, strProperty);
 }
 
-bool MAPIAppointment::SetPropertyString(ULONG ulProperty, LPCTSTR szProperty, bool bStream) {
+bool MAPIAppointment::SetPropertyString(ULONG ulProperty, const String &szProperty, bool bStream) {
 	return m_pMAPI->GetPOOM()->SetProperty(m_pAppointment,ulProperty, szProperty);
 }
 
 #else
 
-bool MAPIAppointment::GetSubject(String& strSubject) {
-	if(GetPropertyString(PR_SUBJECT, strSubject)) 
-		return true;
-	return false;
+String MAPIAppointment::GetSubject() {
+	return GetPropertyString(PR_SUBJECT); 
 }
 
-bool MAPIAppointment::GetLocation(String& strLocation) {
+String MAPIAppointment::GetLocation() {
+	String strLocation;
 	if(GetOutlookPropertyString(OUTLOOK_DATA2, OUTLOOK_APPOINTMENT_LOCATION, strLocation)) 
-		return true;
-	return false;
+		return strLocation;
+	return String();
 }
 
 Time MAPIAppointment::GetTime(ULONG property) {
@@ -73,40 +72,30 @@ Time MAPIAppointment::GetTime(ULONG property) {
 		FileTimeToLocalFileTime(&pProp->Value.ft, &tmLocal);
 		FileTimeToSystemTime(&tmLocal, &st);
 		MAPIFreeBuffer(pProp);
-		return Time(st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond);
+		return MAPIEx::GetSystemTime(st);
 	}
 	return Null;
 }
 
-bool MAPIAppointment::SetSubject(LPCTSTR szSubject) {
+bool MAPIAppointment::SetSubject(const String &szSubject) {
 	return SetPropertyString(PR_SUBJECT, szSubject);
 }
 
-bool MAPIAppointment::SetLocation(LPCTSTR szLocation) {
+bool MAPIAppointment::SetLocation(const String &szLocation) {
 	return SetOutlookProperty(OUTLOOK_DATA2, OUTLOOK_APPOINTMENT_START, szLocation);
 }
 
-bool MAPIAppointment::SetStartTime(Time tm) {
+bool MAPIAppointment::SetStartTime(const Time &tm) {
 	SYSTEMTIME st;
-	st.wYear   = tm.year;
-	st.wMonth  = tm.month;
-	st.wDay	   = tm.day;
-	st.wHour   = tm.hour;
-	st.wMinute = tm.minute;
-	st.wSecond = tm.second;
+	MAPIEx::SetSystemTime(st, tm);
 	FILETIME ftStart;
 	SystemTimeToFileTime(&st, &ftStart);
 	return SetOutlookProperty(OUTLOOK_DATA2, OUTLOOK_APPOINTMENT_START, ftStart);
 }
 
-bool MAPIAppointment::SetEndTime(Time tm) {
+bool MAPIAppointment::SetEndTime(const Time &tm) {
 	SYSTEMTIME st;
-	st.wYear   = tm.year;
-	st.wMonth  = tm.month;
-	st.wDay	   = tm.day;
-	st.wHour   = tm.hour;
-	st.wMinute = tm.minute;
-	st.wSecond = tm.second;
+	MAPIEx::SetSystemTime(st, tm);
 	FILETIME ftEnd;
 	SystemTimeToFileTime(&st, &ftEnd);
 	return SetOutlookProperty(OUTLOOK_DATA2, OUTLOOK_APPOINTMENT_START, ftEnd);
@@ -116,8 +105,8 @@ const GUID PSETID_Meeting = {0x6ED8DA90, 0x450B, 0x101B, {0x98, 0xDA, 0x00, 0xAA
 
 #define LID_GLOBAL_OBJID 0x23
 
-bool MAPIAppointment::GetMeetingUID(String& strUID) {
-	bool bResult = false;
+String MAPIAppointment::GetMeetingUID() {
+	String strUID;
 
 	MAPINAMEID NamedID = {0};
 	NamedID.lpguid = (LPGUID) &PSETID_Meeting;
@@ -134,12 +123,12 @@ bool MAPIAppointment::GetMeetingUID(String& strUID) {
 		LPSPropValue pProp;
 		ULONG ulVal = 0;
 		if(m_pItem->GetProps(lpNamedPropTags, 0, &ulVal, &pProp) == S_OK) {
-			bResult=GetHexString(strUID, pProp->Value.bin);
+			strUID = GetHexString(pProp->Value.bin);
 			MAPIFreeBuffer(pProp);
 		}
 		MAPIFreeBuffer(lpNamedPropTags);
 	}
-	return bResult;
+	return strUID;
 }
 
 #endif
diff --git a/bazaar/MAPIEx/MAPIAppointment.h b/bazaar/MAPIEx/MAPIAppointment.h
index 1874e4ed4..0940f93ed 100644
--- a/bazaar/MAPIEx/MAPIAppointment.h
+++ b/bazaar/MAPIEx/MAPIAppointment.h
@@ -48,21 +48,21 @@ public:
 	bool Open(MAPIEx* pMAPI, IAppointment* pAppointment);
 	virtual void Close();
 
-	virtual bool GetPropertyString(ULONG ulProperty, String& strProperty, bool bStream=false);
-	virtual bool SetPropertyString(ULONG ulProperty, LPCTSTR szProperty, bool bStream=false);
+	virtual bool GetPropertyString(ULONG ulProperty, String& strProperty, bool bStream = false);
+	virtual bool SetPropertyString(ULONG ulProperty, const String &szProperty, bool bStream = false);
 #else
-	bool GetSubject(String& strSubject);
-	bool GetLocation(String& strLocation);
+	String GetSubject();
+	String GetLocation();
 	Time GetTime(ULONG property);
 	Time GetStartTime()		{return GetTime(OUTLOOK_APPOINTMENT_START);}
 	Time GetEndTime()		{return GetTime(OUTLOOK_APPOINTMENT_END);}
 
-	bool SetSubject(LPCTSTR szSubject);
-	bool SetLocation(LPCTSTR szLocation);
-	bool SetStartTime(Time tm);
-	bool SetEndTime(Time tm);
+	bool SetSubject(const String &szSubject);
+	bool SetLocation(const String &szLocation);
+	bool SetStartTime(const Time &tm);
+	bool SetEndTime(const Time &tm);
 	
-	bool GetMeetingUID(String& strUID);
+	String GetMeetingUID();
 #endif
 };
 
diff --git a/bazaar/MAPIEx/MAPIAttachment.cpp b/bazaar/MAPIEx/MAPIAttachment.cpp
index ad787223a..2df98b930 100644
--- a/bazaar/MAPIEx/MAPIAttachment.cpp
+++ b/bazaar/MAPIEx/MAPIAttachment.cpp
@@ -99,35 +99,35 @@ void MAPIAttachment::Close() {
 	MAPIObject::Close();
 }
 
-bool MAPIAttachment::GetDisplayName(String& strDisplayName) {
-	return GetPropertyString(PR_DISPLAY_NAME, strDisplayName);
+String MAPIAttachment::GetDisplayName() {
+	return GetPropertyString(PR_DISPLAY_NAME);
 }
 
-bool MAPIAttachment::GetFileName(String& strFileName) {
-	return GetPropertyString(PR_ATTACH_FILENAME, strFileName);
+String MAPIAttachment::GetFileName() {
+	return GetPropertyString(PR_ATTACH_FILENAME);
 }
 
-bool MAPIAttachment::GetLongFileName(String& strLongFileName) {
-	return GetPropertyString(PR_ATTACH_LONG_FILENAME, strLongFileName);
+String MAPIAttachment::GetLongFileName() {
+	return GetPropertyString(PR_ATTACH_LONG_FILENAME);
 }
 
-bool MAPIAttachment::GetCID(String& strCID) {
-	return GetPropertyString(PR_ATTACH_CONTENT_ID, strCID);
+String MAPIAttachment::GetCID() {
+	return GetPropertyString(PR_ATTACH_CONTENT_ID);
 }
 
-bool MAPIAttachment::SetDisplayName(LPCTSTR szDisplayName) {
+bool MAPIAttachment::SetDisplayName(const String &szDisplayName) {
 	return SetPropertyString(PR_DISPLAY_NAME, szDisplayName);
 }
 
-bool MAPIAttachment::SetFileName(LPCTSTR szFileName) {
+bool MAPIAttachment::SetFileName(const String &szFileName) {
 	return SetPropertyString(PR_ATTACH_FILENAME, szFileName);
 }
 
-bool MAPIAttachment::SetLongFileName(LPCTSTR szLongFileName) {
+bool MAPIAttachment::SetLongFileName(const String &szLongFileName) {
 	return SetPropertyString(PR_ATTACH_LONG_FILENAME, szLongFileName);
 }
 
-bool MAPIAttachment::SetCID(LPCTSTR szCID) {
+bool MAPIAttachment::SetCID(const String &szCID) {
 	return SetPropertyString(PR_ATTACH_CONTENT_ID, szCID);
 }
 
@@ -172,7 +172,7 @@ void MAPIAttachment::CloseStream() {
 	}
 }
 
-bool MAPIAttachment::LoadAttachment(LPCTSTR szPath) {
+bool MAPIAttachment::LoadAttachment(const String &szPath) {
 	String file = LoadFile(szPath);
 	
 	if(file.IsEmpty() || !OpenStream(true))
@@ -182,7 +182,7 @@ bool MAPIAttachment::LoadAttachment(LPCTSTR szPath) {
 	return true;
 }
 
-bool MAPIAttachment::SaveAttachment(LPCTSTR szPath) {
+bool MAPIAttachment::SaveAttachment(const String &szPath) {
 	if (!OpenStream(false))
 		return false;
 	String file;
diff --git a/bazaar/MAPIEx/MAPIAttachment.h b/bazaar/MAPIEx/MAPIAttachment.h
index 5c3c84a20..d9d6f1329 100644
--- a/bazaar/MAPIEx/MAPIAttachment.h
+++ b/bazaar/MAPIEx/MAPIAttachment.h
@@ -41,23 +41,23 @@ public:
 	bool Open(LPMESSAGE pMessage, int nIndex);
 	void Close();
 
-	bool GetDisplayName(String& strDisplayName);
-	bool GetFileName(String& strFileName);
-	bool GetLongFileName(String& strLongFileName);
-	bool GetCID(String& strCID);
+	String GetDisplayName();
+	String GetFileName();
+	String GetLongFileName();
+	String GetCID();
 
-	bool SetDisplayName(LPCTSTR szDisplayName);
-	bool SetFileName(LPCTSTR szFileName);
-	bool SetLongFileName(LPCTSTR szLongFileName);
-	bool SetCID(LPCTSTR szCID);
+	bool SetDisplayName(const String &szDisplayName);
+	bool SetFileName(const String &szFileName);
+	bool SetLongFileName(const String &szLongFileName);
+	bool SetCID(const String &szCID);
 
-	bool OpenStream(bool bCreate=FALSE);
+	bool LoadAttachment(const String &szPath);
+	bool SaveAttachment(const String &szPath);
+	
+	bool OpenStream(bool bCreate = false);
 	int Read(BYTE* pData, int nCount);
 	int Write(BYTE* pData, int nCount);
 	void CloseStream();
-
-	bool LoadAttachment(LPCTSTR szPath);
-	bool SaveAttachment(LPCTSTR szPath);
 };
 
 #endif
diff --git a/bazaar/MAPIEx/MAPIContact.cpp b/bazaar/MAPIEx/MAPIContact.cpp
index 053d56f15..397e4c278 100644
--- a/bazaar/MAPIEx/MAPIContact.cpp
+++ b/bazaar/MAPIEx/MAPIContact.cpp
@@ -40,11 +40,11 @@ bool ContactAddress::FillAddress(MAPIContact& contact,AddressType nType) {
 		return false;
 	m_nType = nType;
 
-	if(!contact.GetPropertyString(ContactAddressTag[nType][0], m_strCity)) return false;
-	if(!contact.GetPropertyString(ContactAddressTag[nType][1], m_strCountry)) return false;
-	if(!contact.GetPropertyString(ContactAddressTag[nType][2], m_strStateOrProvince)) return false;
-	if(!contact.GetPropertyString(ContactAddressTag[nType][3], m_strStreet)) return false;
-	if(!contact.GetPropertyString(ContactAddressTag[nType][4], m_strPostalCode)) return false;
+	m_strCity = contact.GetPropertyString(ContactAddressTag[nType][0]);
+	m_strCountry = contact.GetPropertyString(ContactAddressTag[nType][1]);
+	m_strStateOrProvince = contact.GetPropertyString(ContactAddressTag[nType][2]);
+	m_strStreet = contact.GetPropertyString(ContactAddressTag[nType][3]);
+	m_strPostalCode = contact.GetPropertyString(ContactAddressTag[nType][4]);
 	return true;
 }
 
@@ -133,15 +133,14 @@ bool MAPIContact::Create(MAPIEx &mapi, MAPIFolder &folder) {
 #endif
 }
 
-bool MAPIContact::GetName(String& strName, ULONG ulNameID) {
+String MAPIContact::GetName(ULONG ulNameID) {
 	ULONG i = 0;
 	while(NameIDs[i] != ulNameID && NameIDs[i] > 0) 
 		i++;
-	if(!NameIDs[i]) {
-		strName = "";
-		return false;
-	} else 
-		return GetPropertyString(ulNameID, strName);
+	if(!NameIDs[i]) 
+		return String();
+	else 
+		return GetPropertyString(ulNameID);
 }
 
 int MAPIContact::GetOutlookEmailID(int nIndex) {
@@ -152,10 +151,11 @@ int MAPIContact::GetOutlookEmailID(int nIndex) {
 }
 
 // uses the built in outlook email fields, OUTLOOK_EMAIL1 etc, minus 1 for ADDRt_YPE and +1 for EmailOriginalDisplayName
-bool MAPIContact::GetEmail(String& strEmail, int nIndex) {
+String MAPIContact::GetEmail(int nIndex) {
+	String strEmail;
 	ULONG nID = GetOutlookEmailID(nIndex);
 	if(!nID) 
-		return false;
+		return String();
 
 #ifdef _WIN32_WCE
 	return GetPropertyString(nID, strEmail);
@@ -174,126 +174,128 @@ bool MAPIContact::GetEmail(String& strEmail, int nIndex) {
 					MAPIFreeBuffer(pProp);
 				}
 			}
-			return true;
+			return strEmail;
 		}
 	}
-	return false;
+	return String();
 #endif
 }
 
-bool MAPIContact::GetEmailDisplayAs(String& strDisplayAs, int nIndex) {
+String MAPIContact::GetEmailDisplayAs(int nIndex) {
+	String strDisplayAs;
 #ifdef _WIN32_WCE
 	return GetEmail(strDisplayAs, nIndex);
 #else
 	ULONG nID = GetOutlookEmailID(nIndex);
 	if(!nID) 
-		return false;
+		return String();
 
 	LPSPropValue pProp;
 	if(GetOutlookProperty(OUTLOOK_DATA1, nID-3, pProp)) {
-		strDisplayAs=MAPIEx::GetValidString(*pProp);
+		strDisplayAs = MAPIEx::GetValidString(*pProp);
 		MAPIFreeBuffer(pProp);
-		return true;
+		return strDisplayAs;
 	}
-	return false;
+	return String();
 #endif
 }
 
-bool MAPIContact::GetHomePage(String& strHomePage, bool bBusiness) {
-	return GetPropertyString(bBusiness ? PR_BUSINESS_HOME_PAGE  : PR_PERSONAL_HOME_PAGE, strHomePage);
+String MAPIContact::GetHomePage(bool bBusiness) {
+	return GetPropertyString(bBusiness ? PR_BUSINESS_HOME_PAGE  : PR_PERSONAL_HOME_PAGE);
 }
 
-bool MAPIContact::GetPhoneNumber(String& strPhoneNumber, ULONG ulPhoneNumberID) {
+String MAPIContact::GetPhoneNumber(ULONG ulPhoneNumberID) {
 	ULONG i = 0;
 	while(PhoneNumberIDs[i] != ulPhoneNumberID && PhoneNumberIDs[i] > 0) 
 		i++;
-	if(!PhoneNumberIDs[i]) {
-		strPhoneNumber = "";
-		return false;
-	} else 
-		return GetPropertyString(ulPhoneNumberID, strPhoneNumber);
+	if(!PhoneNumberIDs[i]) 
+		return String();
+	else 
+		return GetPropertyString(ulPhoneNumberID);
 }
 
 bool MAPIContact::GetAddress(ContactAddress& address, ContactAddress::AddressType nType) {
 	return address.FillAddress(*this, nType);
 }
 
-bool MAPIContact::GetPostalAddress(String& strAddress) {
+String MAPIContact::GetPostalAddress() {
 #ifdef _WIN32_WCE
-	return false;
+	return String();
 #else
-	return GetPropertyString(PR_POSTAL_ADDRESS, strAddress);
+	return GetPropertyString(PR_POSTAL_ADDRESS);
 #endif
 }
 
-bool MAPIContact::GetIMAddress(String& strIMAddress) {
+String MAPIContact::GetIMAddress() {
+	String strIMAddress;
 #ifndef _WIN32_WCE
 	LPSPropValue pProp;
 	if(GetOutlookProperty(OUTLOOK_DATA1, OUTLOOK_IM_ADDRESS, pProp)) {
-		strIMAddress=MAPIEx::GetValidString(*pProp);
+		strIMAddress = MAPIEx::GetValidString(*pProp);
 		MAPIFreeBuffer(pProp);
-		return true;
+		return strIMAddress;
 	}
 #endif
-	return false;
+	return String();
 }
 
-bool MAPIContact::GetFileAs(String& strFileAs) {
+String MAPIContact::GetFileAs() {
+	String strFileAs;
 #ifdef _WIN32_WCE
 	return GetPropertyString(PR_DISPLAY_NAME, strFileAs);
 #else
 	LPSPropValue pProp;
 	if(GetOutlookProperty(OUTLOOK_DATA1, OUTLOOK_FILE_AS, pProp)) {
-		strFileAs=MAPIEx::GetValidString(*pProp);
+		strFileAs = MAPIEx::GetValidString(*pProp);
 		MAPIFreeBuffer(pProp);
-		return true;
+		return strFileAs;
 	}
-	return false;
+	return String();
 #endif
 }
 
-bool MAPIContact::GetTitle(String& strTitle) {
-	return GetPropertyString(PR_TITLE, strTitle);
+String MAPIContact::GetTitle() {
+	return GetPropertyString(PR_TITLE);
 }
 
-bool MAPIContact::GetCompany(String& strCompany) {
-	return GetPropertyString(PR_COMPANY_NAME, strCompany);
+String MAPIContact::GetCompany() {
+	return GetPropertyString(PR_COMPANY_NAME);
 }
 
-bool MAPIContact::GetProfession(String& strProfession) {
-	return GetPropertyString(PR_PROFESSION, strProfession);
+String MAPIContact::GetProfession() {
+	return GetPropertyString(PR_PROFESSION);
 }
 
-bool MAPIContact::GetDisplayNamePrefix(String& strPrefix) {
-	return GetPropertyString(PR_DISPLAY_NAME_PREFIX, strPrefix);
+String MAPIContact::GetDisplayNamePrefix() {
+	return GetPropertyString(PR_DISPLAY_NAME_PREFIX);
 }
 
-bool MAPIContact::GetGeneration(String& strGeneration) {
-	return GetPropertyString(PR_GENERATION, strGeneration);
+String MAPIContact::GetGeneration() {
+	return GetPropertyString(PR_GENERATION);
 }
 
-bool MAPIContact::GetDepartment(String& strDepartment) {
-	return GetPropertyString(PR_DEPARTMENT_NAME, strDepartment);
+String MAPIContact::GetDepartment() {
+	return GetPropertyString(PR_DEPARTMENT_NAME);
 }
 
-bool MAPIContact::GetOffice(String& strOffice) {
-	return GetPropertyString(PR_OFFICE_LOCATION, strOffice);
+String MAPIContact::GetOffice() {
+	return GetPropertyString(PR_OFFICE_LOCATION);
 }
 
-bool MAPIContact::GetManagerName(String& strManagerName) {
-	return GetPropertyString(PR_MANAGER_NAME, strManagerName);
+String MAPIContact::GetManagerName() {
+	return GetPropertyString(PR_MANAGER_NAME);
 }
 
-bool MAPIContact::GetAssistantName(String& strAssistantName) {
-	return GetPropertyString(PR_ASSISTANT, strAssistantName);
+String MAPIContact::GetAssistantName() {
+	return GetPropertyString(PR_ASSISTANT);
 }
 
-bool MAPIContact::GetNickName(String& strNickName) {
-	return GetPropertyString(PR_NICKNAME, strNickName);
+String MAPIContact::GetNickName() {
+	return GetPropertyString(PR_NICKNAME);
 }
 
-bool MAPIContact::GetSpouseName(String& strSpouseName) {
-	return GetPropertyString(PR_SPOUSE_NAME, strSpouseName);
+String MAPIContact::GetSpouseName() {
+	return GetPropertyString(PR_SPOUSE_NAME);
 }
 
 Time MAPIContact::GetTime(ULONG property) {
@@ -312,14 +314,15 @@ Time MAPIContact::GetTime(ULONG property) {
 		SystemTimeToTzSpecificLocalTime(NULL, &tm, &st);
 
 		MAPIFreeBuffer(pProp);
-		return Time(st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond);
+		return MAPIEx::GetSystemTime(st);
 	}
 	return Null;
 #endif
 }
 
 // Categories are stored under the multi-value named property CATEGORIES_PROPERTY
-bool MAPIContact::GetCategories(String& strCategories) {
+String MAPIContact::GetCategories() {
+	String strCategories;
 #ifdef _WIN32_WCE
 	return GetPropertyString(OUTLOOK_CATEGORIES, strCategories);
 #else
@@ -338,9 +341,9 @@ bool MAPIContact::GetCategories(String& strCategories) {
 			}
 		}
 		MAPIFreeBuffer(pProp);
-		return true;
+		return strCategories;
 	}
-	return false;
+	return String();
 #endif
 }
 
@@ -449,7 +452,7 @@ bool MAPIContact::UpdateDisplayAddress(ContactAddress::AddressType nType) {
 #endif
 }
 
-bool MAPIContact::SetNotes(String szNotes, bool bRTF) {
+bool MAPIContact::SetNotes(const String &szNotes, bool bRTF) {
 #ifdef _WIN32_WCE
 	return SetPropertyString(PR_BODY, szNotes);
 #else
@@ -519,16 +522,19 @@ bool MAPIContact::SetGeneration(const String &szGeneration) {
 // After changing any name field you should call this to update PR_INITIALS and PR_DISPLAY_NAME
 bool MAPIContact::UpdateDisplayName() {
 	String strPrefix, strFirst, strMiddle, strLast, strGeneration, strFullName, strFileAs, strInitials;
-	if(GetDisplayNamePrefix(strPrefix) && strPrefix.GetLength()) {
+	strPrefix = GetDisplayNamePrefix();
+	if(strPrefix.GetLength()) {
 		strFullName = strPrefix;
 		strFullName += ' ';
 	}
-	if(GetName(strFirst, PR_GIVEN_NAME) && strFirst.GetLength()) {
+	strFirst = GetName(PR_GIVEN_NAME);
+	if(strFirst.GetLength()) {
 		strFileAs += strFirst;
 		strInitials += strFirst[0];
 		strInitials += '.';
 	}
-	if(GetName(strMiddle, PR_MIDDLE_NAME) && strMiddle.GetLength()) {
+	strMiddle = GetName(PR_MIDDLE_NAME);
+	if(strMiddle.GetLength()) {
 		if(strFileAs.GetLength()) 
 			strFileAs += ' ';
 		strFileAs += strMiddle;
@@ -544,7 +550,8 @@ bool MAPIContact::UpdateDisplayName() {
 			i++;
 		}
 	}
-	if(GetName(strLast, PR_SURNAME) && strLast.GetLength())  {
+	strLast = GetName(PR_SURNAME);
+	if(strLast.GetLength())  {
 		if(strFileAs.GetLength()) 
 			strFileAs += ' ';
 		strFileAs += strLast;
@@ -553,10 +560,11 @@ bool MAPIContact::UpdateDisplayName() {
 	}
 	if(strFileAs.GetLength()) 
 		strFullName += strFileAs;
-	if(GetGeneration(strGeneration) && strGeneration.GetLength()) {
+	strGeneration = GetGeneration();
+	if(strGeneration.GetLength()) {
 		if(strFullName.GetLength()) 
 			strFullName += ' ';
-		strFullName+=strGeneration;
+		strFullName += strGeneration;
 	}
 
 #ifdef _WIN32_WCE
@@ -597,15 +605,9 @@ bool MAPIContact::SetSpouseName(const String &szSpouseName) {
 	return SetPropertyString(PR_SPOUSE_NAME, szSpouseName);
 }
 
-bool MAPIContact::SetBirthday(Time tm) {
+bool MAPIContact::SetBirthday(const Time &tm) {
 	SYSTEMTIME st;
-	st.wYear   = tm.year;
-	st.wMonth  = tm.month;
-	st.wDay	   = tm.day;
-	st.wHour   = tm.hour;
-	st.wMinute = tm.minute;
-	st.wSecond = tm.second;
-	st.wMilliseconds = st.wDayOfWeek = 0;
+	MAPIEx::SetSystemTime(st, tm);
 	
 #ifdef _WIN32_WCE
 	return m_pPOOM ? m_pPOOM->SetDate(m_pContact, PR_BIRTHDAY, st) : false;
@@ -617,15 +619,9 @@ bool MAPIContact::SetBirthday(Time tm) {
 #endif
 }
 
-bool MAPIContact::SetAnniversary(Time tm) {
+bool MAPIContact::SetAnniversary(const Time &tm) {
 	SYSTEMTIME st;
-	st.wYear   = tm.year;
-	st.wMonth  = tm.month;
-	st.wDay	   = tm.day;
-	st.wHour   = tm.hour;
-	st.wMinute = tm.minute;
-	st.wSecond = tm.second;
-	st.wMilliseconds = st.wDayOfWeek = 0;
+	MAPIEx::SetSystemTime(st, tm);
 	
 #ifdef _WIN32_WCE
 	return m_pPOOM ? m_pPOOM->SetDate(m_pContact, PR_WEDDING_ANNIVERSARY,tmAnniversary) : false;
diff --git a/bazaar/MAPIEx/MAPIContact.h b/bazaar/MAPIEx/MAPIContact.h
index 2f0f9d18e..7d856bd6c 100644
--- a/bazaar/MAPIEx/MAPIContact.h
+++ b/bazaar/MAPIEx/MAPIContact.h
@@ -77,50 +77,52 @@ public:
 	inline LPMAILUSER Contact() { return (LPMAILUSER)m_pItem; }
 
 #ifdef _WIN32_WCE
+protected:
 	bool Open(MAPIEx* pMAPI, CPOOM* pPOOM, IContact* pContact);
 	virtual void Close();
 	virtual bool Save(bool bClose=true);
-
-	virtual bool GetPropertyString(ULONG ulProperty, String& strProperty, bool bStream=false);
-	virtual bool SetPropertyString(ULONG ulProperty, LPCTSTR szProperty, bool bStream=false);
+	
+	virtual String GetPropertyString(ULONG ulProperty, bool bStream = false);
+	virtual bool SetPropertyString(ULONG ulProperty, const String &szProperty, bool bStream=false);
+	
 #endif
-
+public:
 	bool Create(MAPIEx &mapi, MAPIFolder &folder);
 
-	bool GetName(String& strName, ULONG ulNameID=PR_DISPLAY_NAME);
-	bool GetEmail(String& strEmail, int nIndex=1); // 1, 2 or 3 for outlook email addresses
-	bool GetEmailDisplayAs(String& strDisplayAs, int nIndex=1);
-	bool GetHomePage(String& strHomePage, bool bBuiness=true);
-	bool GetPhoneNumber(String& strPhoneNumber, ULONG ulPhoneNumberID);
+	String GetName(ULONG ulNameID = PR_DISPLAY_NAME);
+	String GetEmail(int nIndex = 1); // 1, 2 or 3 for outlook email addresses
+	String GetEmailDisplayAs(int nIndex = 1);
+	String GetHomePage(bool bBusiness = true);
+	String GetPhoneNumber(ULONG ulPhoneNumberID);
 	bool GetAddress(ContactAddress& address, ContactAddress::AddressType nType);
-	bool GetPostalAddress(String& strAddress);
-	bool GetIMAddress(String& strIMAddress);
-	bool GetFileAs(String& strFileAs);
-	bool GetTitle(String& strTitle);
-	bool GetCompany(String& strCompany);
-	bool GetProfession(String& strProfession);
-	bool GetDisplayNamePrefix(String& strPrefix);
-	bool GetGeneration(String& strGeneration);
-	bool GetDepartment(String& strDepartment);
-	bool GetOffice(String& strOffice);
-	bool GetManagerName(String& strManagerName);
-	bool GetAssistantName(String& strAssistantName);
-	bool GetNickName(String& strNickName);
-	bool GetSpouseName(String& strSpouseName);
+	String GetPostalAddress();
+	String GetIMAddress();
+	String GetFileAs();
+	String GetTitle();
+	String GetCompany();
+	String GetProfession();
+	String GetDisplayNamePrefix();
+	String GetGeneration();
+	String GetDepartment();
+	String GetOffice();
+	String GetManagerName();
+	String GetAssistantName();
+	String GetNickName();
+	String GetSpouseName();
 	Time GetTime(ULONG property);
 	Time GetBirthday()		{return GetTime(PR_BIRTHDAY);}
 	Time GetAnniversary()	{return GetTime(PR_WEDDING_ANNIVERSARY);}
-	bool GetCategories(String& strCategories);
+	String GetCategories();
 
-	bool SetName(const String &szName, ULONG ulNameID=PR_DISPLAY_NAME);
-	bool SetEmail(const String &szEmail, int nIndex=1);
+	bool SetName(const String &szName, ULONG ulNameID = PR_DISPLAY_NAME);
+	bool SetEmail(const String &szEmail, int nIndex = 1);
 	bool SetEmailDisplayAs(const String &szDisplayAs, int nIndex = 1);
 	bool SetHomePage(const String &szHomePage, bool bBusiness = true);
 	bool SetPhoneNumber(const String &szPhoneNumber, ULONG ulPhoneNumberID);
 	bool SetAddress(ContactAddress& address, ContactAddress::AddressType nType);
 	bool SetPostalAddress(ContactAddress::AddressType nType);
 	bool UpdateDisplayAddress(ContactAddress::AddressType nType);
-	bool SetNotes(String szNotes, bool bRTF=false);
+	bool SetNotes(const String &szNotes, bool bRTF=false);
 	bool SetIMAddress(const String &szIMAddress);
 	bool SetFileAs(const String &szFileAs);
 	bool SetTitle(const String &szTitle);
@@ -135,8 +137,8 @@ public:
 	bool SetAssistantName(const String &szAssistantName);
 	bool SetNickName(const String &szNickName);
 	bool SetSpouseName(const String &szSpouseName);
-	bool SetBirthday(Time tm);
-	bool SetAnniversary(Time tm);
+	bool SetBirthday(const Time &tm);
+	bool SetAnniversary(const Time &tm);
 	bool SetCategories(const String &szCategories);
 	bool HasPicture();
 	bool SetPicture(const String &szPath);
diff --git a/bazaar/MAPIEx/MAPIEx.cpp b/bazaar/MAPIEx/MAPIEx.cpp
index 9c0391082..66cad267e 100644
--- a/bazaar/MAPIEx/MAPIEx.cpp
+++ b/bazaar/MAPIEx/MAPIEx.cpp
@@ -349,7 +349,7 @@ bool MAPIEx::OpenFolder(unsigned long ulFolderID, MAPIFolder& folder) {
 	return false;
 }
 
-bool MAPIEx::OpenFolder(const String folderName, MAPIFolder &folder) {
+bool MAPIEx::OpenFolder(const String &folderName, MAPIFolder &folder) {
 	MAPIFolder root;
 	if(OpenRootFolder(root))
 		root.OpenSubFolder(folderName, folder);
@@ -660,7 +660,7 @@ bool MAPIEx::GetExEmail(SBinary entryID, String& strEmail) {
 	return bResult;
 }
 
-void MAPIEx::GetSystemTime(SYSTEMTIME& tm, int wYear, int wMonth, int wDay, int wHour, 
+void MAPIEx::SetSystemTime(SYSTEMTIME& tm, int wYear, int wMonth, int wDay, int wHour, 
 												int wMinute, int wSecond, int wMilliSeconds) {
 	tm.wYear 	= (WORD)wYear;
 	tm.wMonth	= (WORD)wMonth;
@@ -671,3 +671,19 @@ void MAPIEx::GetSystemTime(SYSTEMTIME& tm, int wYear, int wMonth, int wDay, int
 	tm.wMilliseconds= (WORD)wMilliSeconds;
 	tm.wDayOfWeek	= 0;
 }
+
+void MAPIEx::SetSystemTime(SYSTEMTIME& tm, const Time &t) {
+	tm.wYear 	= t.year;
+	tm.wMonth	= t.month;
+	tm.wDay		= t.day;
+	tm.wHour	= t.hour;
+	tm.wMinute	= t.minute;
+	tm.wSecond	= t.second;
+	tm.wMilliseconds = 0;
+	tm.wDayOfWeek	 = 0;
+}
+
+Time MAPIEx::GetSystemTime(SYSTEMTIME& tm) {
+	return Time(tm.wYear, tm.wMonth, tm.wDay, tm.wHour, tm.wMinute, tm.wSecond);
+}
+	
\ No newline at end of file
diff --git a/bazaar/MAPIEx/MAPIEx.h b/bazaar/MAPIEx/MAPIEx.h
index 757a74d19..f9887ea4a 100644
--- a/bazaar/MAPIEx/MAPIEx.h
+++ b/bazaar/MAPIEx/MAPIEx.h
@@ -89,7 +89,7 @@ public:
 	CPOOM* GetPOOM();
 #endif
 
-	bool OpenFolder(const String folderName, MAPIFolder &folder);
+	bool OpenFolder(const String &folderName, MAPIFolder &folder);
 	bool OpenSpecialFolder(unsigned long ulFolderID, MAPIFolder &folder);
 	bool OpenRootFolder(MAPIFolder &folder);
 	bool OpenInbox(MAPIFolder &folder);
@@ -101,16 +101,19 @@ public:
 	bool OpenCalendar(MAPIFolder &folder);
 
 	bool Notify(LPNOTIFCALLBACK OnNewEvent, LPVOID lpvContext, ULONG ulEventMask);
-	static void PumpMessages();
 
 	bool SelectContacts(Vector<String> &emails, const String caption);
 	
 protected:
+	static void PumpMessages();
 	bool GetExEmail(SBinary entryID, String& strEmail);
 	static String GetValidString(SPropValue& prop);
 	static String GetValidMVString(SPropValue& prop, int nIndex);
 	static void GetNarrowString(SPropValue& prop, String& strNarrow);
-	static void GetSystemTime(SYSTEMTIME& tm, int wYear, int wMonth, int wDay, int wHour=0, int wMinute=0, int wSecond=0, int wMilliSeconds=0);
+	static void SetSystemTime(SYSTEMTIME& tm, int wYear, int wMonth, int wDay, int wHour=0, 
+											int wMinute=0, int wSecond=0, int wMilliSeconds=0);
+	static void SetSystemTime(SYSTEMTIME& tm, const Time &t);
+	static Time GetSystemTime(SYSTEMTIME& tm);
 	bool CompareEntryIDs(ULONG cb1, LPENTRYID lpb1, ULONG cb2, LPENTRYID lpb2);
 	int ShowAddressBook(LPADRLIST& pAddressList, const String caption);
 	bool GetEmail(ADRENTRY& adrEntry, String& strEmail);
@@ -129,6 +132,7 @@ protected:
 	friend class MAPIFolder;
 	friend class MAPIContact;
 	friend class MAPIAttachment;
+	friend class MAPIAppointment;
 };
 
 #ifndef MSGSTATUS_HAS_PR_BODY_HTML
diff --git a/bazaar/MAPIEx/MAPIFolder.cpp b/bazaar/MAPIEx/MAPIFolder.cpp
index dac01a16b..9e3178244 100644
--- a/bazaar/MAPIEx/MAPIFolder.cpp
+++ b/bazaar/MAPIEx/MAPIFolder.cpp
@@ -104,7 +104,7 @@ LPMAPITABLE MAPIFolder::GetHierarchy() {
 
 // High Level function to open a sub folder by iterating recursively (DFS) over all folders 
 // (use instead of manually calling GetHierarchy and GetNextSubFolder)
-bool MAPIFolder::OpenSubFolder(const String subFolderName, MAPIFolder &subFolder) {
+bool MAPIFolder::OpenSubFolder(const String &subFolderName, MAPIFolder &subFolder) {
 	if(!GetHierarchy()) 
 		return NULL;
 
@@ -124,7 +124,7 @@ bool MAPIFolder::OpenSubFolder(const String subFolderName, MAPIFolder &subFolder
 } 
 
 // Creates a sub-folder under pFolder, opens the folder if it already exists
-bool MAPIFolder::CreateSubFolder(const String subFolderName, MAPIFolder &subFolder) {
+bool MAPIFolder::CreateSubFolder(const String &subFolderName, MAPIFolder &subFolder) {
 	LPMAPIFOLDER pSubFolder = NULL;
 	ULONG ulFolderType=FOLDER_GENERIC;
 	ULONG ulFlags=OPEN_IF_EXISTS | MAPIEx::cm_nMAPICode;
@@ -136,7 +136,7 @@ bool MAPIFolder::CreateSubFolder(const String subFolderName, MAPIFolder &subFold
 }
 
 // Deletes a sub-folder and ALL sub folders/messages
-bool MAPIFolder::DeleteSubFolder(const String subFolderName) {
+bool MAPIFolder::DeleteSubFolder(const String &subFolderName) {
 	if(GetHierarchy()) {
 		String strFolder;
 		MAPIFolder folder;
diff --git a/bazaar/MAPIEx/MAPIFolder.h b/bazaar/MAPIEx/MAPIFolder.h
index 7067e3b1f..e47b08cdb 100644
--- a/bazaar/MAPIEx/MAPIFolder.h
+++ b/bazaar/MAPIEx/MAPIFolder.h
@@ -68,9 +68,9 @@ protected:
 	bool IsOpened()	{return m_pHierarchy;};
 public:
 	String GetName();
-	bool OpenSubFolder(const String subFolderName, MAPIFolder &subFolder);
-	bool CreateSubFolder(const String subFolderName, MAPIFolder &subFolder);
-	bool DeleteSubFolder(const String subFolder);
+	bool OpenSubFolder(const String &subFolderName, MAPIFolder &subFolder);
+	bool CreateSubFolder(const String &subFolderName, MAPIFolder &subFolder);
+	bool DeleteSubFolder(const String &subFolder);
 	bool DeleteSubFolder(MAPIFolder &folder);
 
 	int GetCount();
diff --git a/bazaar/MAPIEx/MAPIMessage.cpp b/bazaar/MAPIEx/MAPIMessage.cpp
index fe7dd678e..bd43456fe 100644
--- a/bazaar/MAPIEx/MAPIMessage.cpp
+++ b/bazaar/MAPIEx/MAPIMessage.cpp
@@ -35,9 +35,9 @@ bool MAPIMessage::Open(MAPIEx* pMAPI, SBinary entryID) {
 	if(!MAPIObject::Open(pMAPI,entryID)) 
 		return false;
 
-	GetPropertyString(PR_SENDER_NAME, m_strSenderName);
+	m_strSenderName = GetPropertyString(PR_SENDER_NAME);
 	FillSenderEmail();
-	GetPropertyString(PR_SUBJECT, m_strSubject);
+	m_strSubject = GetPropertyString(PR_SUBJECT);
 	
 	return true;
 }
@@ -47,14 +47,13 @@ void MAPIMessage::Close() {
 	MAPIObject::Close();
 }
 
-bool MAPIMessage::GetHeader(String& strHeader) {
-	return GetPropertyString(PR_TRANSPORT_MESSAGE_HEADERS, strHeader);
+String MAPIMessage::GetHeader() {
+	return GetPropertyString(PR_TRANSPORT_MESSAGE_HEADERS);
 }
 
 void MAPIMessage::FillSenderEmail() {
-	String strAddrType;
-	GetPropertyString(PR_SENDER_ADDRTYPE, strAddrType);
-	GetPropertyString(PR_SENDER_EMAIL_ADDRESS, m_strSenderEmail);
+	String strAddrType = GetPropertyString(PR_SENDER_ADDRTYPE);
+	m_strSenderEmail = GetPropertyString(PR_SENDER_EMAIL_ADDRESS);
 
 	// for Microsoft Exchange server internal mails we want to try to resolve the SMTP email address
 	if(strAddrType == "EX") {
@@ -75,21 +74,21 @@ Time MAPIMessage::GetTime(ULONG property) {
 		FileTimeToLocalFileTime(&pProp->Value.ft, &tmLocal);
 		FileTimeToSystemTime(&tmLocal, &st);
 		MAPIFreeBuffer(pProp);
-		return Time(st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond);
+		return MAPIEx::GetSystemTime(st);
 	}
 	return Null;
 }
 
-bool MAPIMessage::GetTo(String& strTo) {
-	return GetPropertyString(PR_DISPLAY_TO, strTo);
+String MAPIMessage::GetTo() {
+	return GetPropertyString(PR_DISPLAY_TO);
 }
 
-bool MAPIMessage::GetCC(String& strCC) {
-	return GetPropertyString(PR_DISPLAY_CC, strCC);
+String MAPIMessage::GetCC() {
+	return GetPropertyString(PR_DISPLAY_CC);
 }
 
-bool MAPIMessage::GetBCC(String& strBCC) {
-	return GetPropertyString(PR_DISPLAY_BCC, strBCC);
+String MAPIMessage::GetBCC() {
+	return GetPropertyString(PR_DISPLAY_BCC);
 }
 
 int MAPIMessage::GetMessageStatus() {
@@ -117,7 +116,7 @@ bool MAPIMessage::GetRecipients() {
 	return (m_pRecipients->SetColumns((LPSPropTagArray)&Columns, 0) == S_OK);
 }
 
-bool MAPIMessage::GetNextRecipient(String& strName, String& strEmail, int& nType) {
+bool MAPIMessage::GetNextRecipient(String& strName, String& strEmail, int &nType) {
 	if(!m_pRecipients) 
 		return false;
 
@@ -134,7 +133,7 @@ bool MAPIMessage::GetNextRecipient(String& strName, String& strEmail, int& nType
 				if(m_pMAPI) 
 					m_pMAPI->GetExEmail(pRows->aRow[0].lpProps[PROP_ENTRYID].Value.bin, strEmail);
 			} else 
-				strEmail=MAPIEx::GetValidString(pRows->aRow[0].lpProps[PROP_RECIPIENT_EMAIL]);
+				strEmail = MAPIEx::GetValidString(pRows->aRow[0].lpProps[PROP_RECIPIENT_EMAIL]);
 			bResult = true;
 		}
 		FreeProws(pRows);
@@ -142,8 +141,9 @@ bool MAPIMessage::GetNextRecipient(String& strName, String& strEmail, int& nType
 	return bResult;
 }
 
-bool MAPIMessage::GetReplyTo(String& strEmail) {
-	bool bResult=false;
+String MAPIMessage::GetReplyTo() {
+	String strEmail;
+	bool bResult = false;
 	LPSPropValue prop;
 	if(GetProperty(PR_REPLY_RECIPIENT_ENTRIES, prop) == S_OK) {
 		LPFLATENTRYLIST pReplyEntryList = (LPFLATENTRYLIST)prop->Value.bin.lpb;
@@ -157,7 +157,10 @@ bool MAPIMessage::GetReplyTo(String& strEmail) {
 		}
 		MAPIFreeBuffer(prop);
 	}
-	return bResult;
+	if (bResult)
+		return strEmail;
+	else
+		return String();
 }
 
 // nPriority defaults to IMPORTANCE_NORMAL, IMPORTANCE_HIGH or IMPORTANCE_LOW also valid
@@ -231,7 +234,7 @@ bool MAPIMessage::AddRecipients(LPADRLIST pAddressList) {
 }
 
 // AddrType only needed by Windows CE, use SMTP, or SMS etc, default NULL will not set PR_ADDRTYPE
-bool MAPIMessage::AddRecipient(const String email, int nType, const char* szAddrType) {
+bool MAPIMessage::AddRecipient(const String &email, int nType, const char* szAddrType) {
 	if(!Message() || !m_pMAPI) 
 		return false;
 
@@ -272,12 +275,12 @@ bool MAPIMessage::AddRecipient(const String email, int nType, const char* szAddr
 	return bResult;
 }
 
-void MAPIMessage::SetSubject(const String subject) {
+void MAPIMessage::SetSubject(const String &subject) {
 	m_strSubject = subject;
 	SetPropertyString(PR_SUBJECT, subject);
 }
 
-void MAPIMessage::SetSender(const String senderName, const String senderEmail) {
+void MAPIMessage::SetSender(const String &senderName, const String &senderEmail) {
 	m_strSenderName = senderName;
 	m_strSenderEmail = senderEmail;
 	LPTSTR szAddrType = (TCHAR*)"SMTP";
@@ -305,7 +308,10 @@ void MAPIMessage::SetSender(const String senderName, const String senderEmail) {
 	}
 }
 
-bool MAPIMessage::SetReceivedTime(SYSTEMTIME tmReceived, bool bLocalTime) {
+bool MAPIMessage::SetReceivedTime(const Time &tm) {
+	SYSTEMTIME tmReceived;
+	MAPIEx::SetSystemTime(tmReceived, tm);
+	
 	SPropValue prop;
 	prop.ulPropTag = PR_MESSAGE_DELIVERY_TIME;
 #ifndef _WIN32_WCE
@@ -315,7 +321,10 @@ bool MAPIMessage::SetReceivedTime(SYSTEMTIME tmReceived, bool bLocalTime) {
 	return (Message() && Message()->SetProps(1, &prop, NULL) == S_OK);
 }
 
-bool MAPIMessage::SetSubmitTime(SYSTEMTIME tmSubmit, bool bLocalTime) {
+bool MAPIMessage::SetSubmitTime(const Time &tm) {
+	SYSTEMTIME tmSubmit;
+	MAPIEx::SetSystemTime(tmSubmit, tm);
+	
 	SPropValue prop;
 	prop.ulPropTag = PR_CLIENT_SUBMIT_TIME;
 #ifndef _WIN32_WCE
@@ -424,7 +433,7 @@ bool MAPIMessage::Send() {
 	return false;
 }
 
-bool MAPIMessage::SaveToFile(const String fileName) {
+bool MAPIMessage::SaveToFile(const String &fileName) {
 	if (!RealizePath(fileName))
 		return false;
 	
diff --git a/bazaar/MAPIEx/MAPIMessage.h b/bazaar/MAPIEx/MAPIMessage.h
index 5e2d9e669..65a35c72b 100644
--- a/bazaar/MAPIEx/MAPIMessage.h
+++ b/bazaar/MAPIEx/MAPIMessage.h
@@ -40,18 +40,19 @@ protected:
 	LPMAPITABLE m_pRecipients;
 
 // Operations
-public:
-	virtual bool Open(MAPIEx* pMAPI,SBinary entry);
+protected:
+	virtual bool Open(MAPIEx* pMAPI, SBinary entry);
 	virtual void Close();
 
+public:
 	bool IsUnread();
-	bool MarkAsRead(bool bRead=true);
+	bool MarkAsRead(bool bRead = true);
 	bool Create(MAPIEx &mapi, MAPIFolder &folder, int nPriority = IMPORTANCE_NORMAL, 
 												  bool bSaveToSentFolder = true); 
 	int ShowForm(MAPIEx* pMAPI, MAPIFolder &folder);
 	bool Send();
 
-	bool GetHeader(String& strHeader);
+	String GetHeader();
 	String GetSenderName() 	{return m_strSenderName;}
 	String GetSenderEmail() {return m_strSenderEmail;}
 	String GetSubject() 	{return m_strSubject;}
@@ -60,9 +61,9 @@ public:
 	Time GetReceivedTime()			{return GetTime(PR_MESSAGE_DELIVERY_TIME);}
 	Time GetLastModificationTime()	{return GetTime(PR_LAST_MODIFICATION_TIME);}
 	Time GetCreationTime()			{return GetTime(PR_CREATION_TIME);};
-	bool GetTo(String& strTo);
-	bool GetCC(String& strCC);
-	bool GetBCC(String& strBCC);
+	String GetTo();
+	String GetCC();
+	String GetBCC();
 	int GetSensitivity();
 	int GetMessageStatus();
 	int GetPriority();
@@ -70,26 +71,28 @@ public:
 
 	bool GetRecipients();
 	bool GetNextRecipient(String& strName, String& strEmail, int& nType);
-	bool GetReplyTo(String& strEmail);
+	String GetReplyTo();
 
 	bool AddRecipients(LPADRLIST pAddressList);
-	bool AddRecipient(const String email, int nType=MAPI_TO, const char* szAddrType=NULL);  // MAPI_CC and MAPI_BCC also valid
-	void SetSubject(const String subject);
-	void SetSender(const String senderName, const String senderEmail);
-	bool SetReceivedTime(SYSTEMTIME tmReceived, bool bLocalTime=false);
-	bool SetSubmitTime(SYSTEMTIME tmSubmit, bool bLocalTime=false);
-	bool SetReadReceipt(bool bSet=true, String szReceiverEmail = Null);
+	bool AddRecipient(const String &email, int nType=MAPI_TO, const char* szAddrType=NULL);  // MAPI_CC and MAPI_BCC also valid
+	void SetSubject(const String &subject);
+	void SetSender(const String &senderName, const String &senderEmail);
+	bool SetReceivedTime(const Time &tm);
+	bool SetSubmitTime(const Time &tm);
+	bool SetReadReceipt(bool bSet = true, String szReceiverEmail = Null);
 	bool SetDeliveryReceipt(bool bSet = true);
 	bool MarkAsPrivate();
 	bool SetMessageStatus(int nMessageStatus);
 
-	bool SaveToFile(const String fileName);
+	bool SaveToFile(const String &fileName);
 
+protected:
 	// compares entryID and subject only
 	bool operator==(MAPIMessage& message);
 
-protected:
 	void FillSenderEmail();
+	
+	friend class MAPIFolder;
 };
 
 #endif
diff --git a/bazaar/MAPIEx/MAPIObject.cpp b/bazaar/MAPIEx/MAPIObject.cpp
index 8ae743dd1..7560d9f3b 100644
--- a/bazaar/MAPIEx/MAPIObject.cpp
+++ b/bazaar/MAPIEx/MAPIObject.cpp
@@ -30,18 +30,18 @@ MAPIObject::MAPIObject() {
 MAPIObject::~MAPIObject() {
 }
 
-bool MAPIObject::GetHexString(String &strHex, SBinary bin) {
-	strHex = "";
+String MAPIObject::GetHexString(SBinary bin) {
+	String strHex;
 	if(bin.cb) {
 		for(ULONG i = 0; i < bin.cb; i++) 
 			strHex += Format("%02X", bin.lpb[i]);
-		return true;
+		return strHex;
 	}
-	return false;
+	return String();
 }
 
-bool MAPIObject::GetEntryIDString(String& strEntryID) {
-	return GetHexString(strEntryID, m_entryID);
+String MAPIObject::GetEntryIDString() {
+	return GetHexString(m_entryID);
 }
 
 void MAPIObject::SetEntryID(SBinary* pEntryID) {
@@ -119,8 +119,8 @@ bool MAPIObject::SetImportance(int nImportance) {
 	return (Message()->SetProps(1, &prop, NULL) == S_OK);
 }
 
-bool MAPIObject::GetMessageClass(String strMessageClass) {
-	return GetPropertyString(PR_MESSAGE_CLASS, strMessageClass);
+String MAPIObject::GetMessageClass() {
+	return GetPropertyString(PR_MESSAGE_CLASS);
 }
 
 bool MAPIObject::SetMessageClass(String szMessageClass) {
@@ -165,8 +165,8 @@ HRESULT MAPIObject::GetProperty(ULONG ulProperty, LPSPropValue& pProp) {
 	return m_pItem->GetProps((LPSPropTagArray)p, MAPIEx::cm_nMAPICode, &ulPropCount, &pProp);
 }
 
-bool MAPIObject::GetPropertyString(ULONG ulProperty, String& strProperty, bool bStream) {
-	strProperty = "";
+String MAPIObject::GetPropertyString(ULONG ulProperty, bool bStream) {
+	String strProperty; 
 	if(bStream) {
 		IStream* pStream;
 		if(Message()->OpenProperty(ulProperty, &IID_IStream,STGM_READ, 0, (LPUNKNOWN*)&pStream) 
@@ -183,19 +183,19 @@ bool MAPIObject::GetPropertyString(ULONG ulProperty, String& strProperty, bool b
 			} while(ulNumChars >= BUF_SIZE);
 
 			RELEASE(pStream);
-			return true;
+			return strProperty;
 		}
 	} else {
 		if (ulProperty == PR_ENTRYID)
-			return GetEntryIDString(strProperty);
+			return GetEntryIDString();
 		LPSPropValue pProp;
 		if(GetProperty(ulProperty, pProp) == S_OK) {
-			strProperty=MAPIEx::GetValidString(*pProp);
+			strProperty = MAPIEx::GetValidString(*pProp);
 			MAPIFreeBuffer(pProp);
-			return true;
+			return strProperty;
 		} 
 	}
-	return false;
+	return String();
 }
 
 int MAPIObject::GetPropertyValue(ULONG ulProperty, int nDefaultValue) {
@@ -601,8 +601,7 @@ String MAPIObject::GetBody(bool bAutoDetect) {
 		else if(nFormat == EDITOR_FORMAT_HTML) 
 			return GetHTML();
 	}
-	GetPropertyString(PR_BODY, strBody, true);
-	return strBody;
+	return GetPropertyString(PR_BODY, true);
 }
 
 bool MAPIObject::SetBody(const String& strBody) {
@@ -614,9 +613,7 @@ bool MAPIObject::SetBody(const String& strBody) {
 }
 
 String MAPIObject::GetHTML() {
-	String strHTML;
-	GetPropertyString(PR_BODY_HTML, strHTML, true);
-	return strHTML;
+	return GetPropertyString(PR_BODY_HTML, true);
 }
 
 bool MAPIObject::SetHTML(const String &strHTML) {
@@ -731,21 +728,16 @@ Time MAPIObject::GetLastModified(SYSTEMTIME &tmLastModified) {
 		SystemTimeToTzSpecificLocalTime(NULL, &tm, &tmLastModified);
 
 		MAPIFreeBuffer(pProp);
-		return Time(tm.wYear, tm.wMonth, tm.wDay, tm.wHour, tm.wMinute, tm.wSecond);
+		return MAPIEx::GetSystemTime(tm);
 	}
 	return Null;
 }
 
-bool MAPIObject::SetLastModified(Time &tm) {
+bool MAPIObject::SetLastModified(const Time &tm) {
 	SPropValue prop;
 	prop.ulPropTag = PR_LAST_MODIFICATION_TIME;
 	SYSTEMTIME st;
-	st.wYear   = tm.year;
-	st.wMonth  = tm.month;
-	st.wDay	   = tm.day;
-	st.wHour   = tm.hour;
-	st.wMinute = tm.minute;
-	st.wSecond = tm.second;
+	MAPIEx::SetSystemTime(st, tm);
 	SystemTimeToFileTime(&st, &prop.Value.ft);
 	return (m_pItem && m_pItem->SetProps(1, &prop, NULL) == S_OK);
 }
\ No newline at end of file
diff --git a/bazaar/MAPIEx/MAPIObject.h b/bazaar/MAPIEx/MAPIObject.h
index 8df437bbb..45fce1f86 100644
--- a/bazaar/MAPIEx/MAPIObject.h
+++ b/bazaar/MAPIEx/MAPIObject.h
@@ -38,17 +38,17 @@ protected:
 // Operations
 public:
 	inline LPMESSAGE Message() { return (LPMESSAGE)m_pItem; }
-	bool GetHexString(String& strHex, SBinary bin);
+	String GetHexString(SBinary bin);
 	SBinary* GetEntryID() { return &m_entryID; }
-	bool GetEntryIDString(String& strEntryID);
-	void SetEntryID(SBinary* pEntryID=NULL);
+	String GetEntryIDString();
+	void SetEntryID(SBinary* pEntryID = NULL);
 	int GetMessageFlags();
 	bool SetMessageFlags(int nFlags);
 	int GetSensitivity();
 	bool SetSensitivity(int nSensitivity);
 	int GetImportance();
 	bool SetImportance(int nImportance);
-	bool GetMessageClass(String strMessageClass);
+	String GetMessageClass();
 	bool SetMessageClass(String szMessageClass);
 	int GetMessageEditorFormat();
 	bool SetMessageEditorFormat(int nFormat);
@@ -58,7 +58,7 @@ public:
 	virtual bool Save(bool bClose=true);
 
 	// Properties
-	virtual bool GetPropertyString(ULONG ulProperty, String& strProperty, bool bStream=false);
+	virtual String GetPropertyString(ULONG ulProperty, bool bStream = false);
 	int GetPropertyValue(ULONG ulProperty, int nDefaultValue);
 	bool GetNamedProperty(LPCTSTR szFieldName, LPSPropValue& pProp);
 	bool GetNamedProperty(LPCTSTR szFieldName, String& strField);
@@ -93,7 +93,7 @@ public:
 
 	// Misc
 	Time GetLastModified(SYSTEMTIME& tmLastModified);
-	bool SetLastModified(Time& tmLastModified);
+	bool SetLastModified(const Time& tmLastModified);
 	
 protected:
 	bool Create(MAPIEx &mapi, MAPIFolder &folder);
diff --git a/bazaar/MAPIEx/src.tpp/MAPIAppointment$en-us.tpp b/bazaar/MAPIEx/src.tpp/MAPIAppointment$en-us.tpp
index 8e47960d9..6597de1e7 100644
--- a/bazaar/MAPIEx/src.tpp/MAPIAppointment$en-us.tpp
+++ b/bazaar/MAPIEx/src.tpp/MAPIAppointment$en-us.tpp
@@ -1,4 +1,4 @@
-topic "class MAPIFolder : public MAPIObject";
+topic "class MAPIAppointment : public MAPIObject";
 [2 $$0,0#00000000000000000000000000000000:Default]
 [i448;a25;kKO9;2 $$1,0#37138531426314131252341829483380:class]
 [l288;2 $$2,2#27521748481378242620020725143825:desc]
@@ -12,12 +12,51 @@ topic "class MAPIFolder : public MAPIObject";
 [{_} 
 [ {{10000@(113.42.0) [s0;%% [*@7;4 MAPIAppointment]]}}&]
 [s0;i448;kKO9;@(0.0.255)0 &]
-[s0;i448;a25;kKO9;:MAPIFolder`:`:class: [@(0.0.255)3 class][3 _][*3 MAPIAppointment][3 _:_][@(0.0.255)3 p
-ublic][3 _][*@3;3 MAPIObject]&]
+[s0;i448;a25;kKO9;:MAPIAppointment`:`:class: [@(0.0.255)3 class][3 _][*3 MAPIAppointment][3 _
+:_][@(0.0.255)3 public][3 _][*@3;3 MAPIObject]&]
 [s9; Outlook meeting/appointment.&]
 [s3;2 &]
-[s3;2 &]
-[ {{10000F(128)G(128)@1 [s0;%% [* Public Method List]]}}&]
 [s0; &]
-[s0;3 &]
+[ {{10000F(128)G(128)@1 [s0;%% [* Constructor detail]]}}&]
+[s4; &]
+[s5;:MAPIAppointment`:`:MAPIAppointment`(`): [* MAPIAppointment]()&]
+[s2;%% Default constructor.&]
+[s3; &]
+[ {{10000F(128)G(128)@1 [s0;%% [* Public Method List]]}}&]
+[s4; &]
+[s5;:MAPIAppointment`:`:GetSubject`(`): [_^String^ String]_[* GetSubject]()&]
+[s2;%% Gets meeting subject.&]
+[s3; &]
+[s4; &]
+[s5;:MAPIAppointment`:`:GetLocation`(`): [_^String^ String]_[* GetLocation]()&]
+[s2;%% Gets meeting location.&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIAppointment`:`:GetStartTime`(`): [_^Time^ Time]_[* GetStartTime]()&]
+[s2;%% Gets meeting start time.&]
+[s3; &]
+[s4; &]
+[s5;:MAPIAppointment`:`:GetEndTime`(`): [_^Time^ Time]_[* GetEndTime]()&]
+[s2;%% Gets meeting end time&]
+[s3; &]
+[s4; &]
+[s5;:MAPIAppointment`:`:SetSubject`(const String`&`): [@(0.0.255) bool]_[* SetSubject]([@(0.0.255) c
+onst]_[_^String^ String]_`&[*@3 szSubject])&]
+[s2;%% Sets meeting subject in [%-*@3 szSubject].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIAppointment`:`:SetLocation`(const String`&`): [@(0.0.255) bool]_[* SetLocation](
+[@(0.0.255) const]_[_^String^ String]_`&[*@3 szLocation])&]
+[s2;%% Sets meeting location in [%-*@3 szLocation].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIAppointment`:`:SetStartTime`(const Time`&`): [@(0.0.255) bool]_[* SetStartTime](
+[@(0.0.255) const]_[_^Time^ Time]_`&[*@3 tm])&]
+[s2;%% Sets meeting start time in [%-*@3 tm].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIAppointment`:`:SetEndTime`(const Time`&`): [@(0.0.255) bool]_[* SetEndTime]([@(0.0.255) c
+onst]_[_^Time^ Time]_`&[*@3 tm])&]
+[s2;%% Sets meeting end time in [%-*@3 tm].&]
+[s3;%% &]
 [s0;%% ]
\ No newline at end of file
diff --git a/bazaar/MAPIEx/src.tpp/MAPIAppointment$en-us.tppi b/bazaar/MAPIEx/src.tpp/MAPIAppointment$en-us.tppi
index 3f1c67784..b0221257f 100644
--- a/bazaar/MAPIEx/src.tpp/MAPIAppointment$en-us.tppi
+++ b/bazaar/MAPIEx/src.tpp/MAPIAppointment$en-us.tppi
@@ -1,6 +1,7 @@
-TITLE("class MAPIFolder : public MAPIObject")
+TITLE("class MAPIAppointment : public MAPIObject")
 COMPRESSED
-120,156,133,146,91,107,27,49,16,133,255,138,192,73,113,130,113,231,34,173,110,47,14,148,180,165,13,206,251,178,36,107,91,77,183,89,95,106,175,159,66,242,219,59,178,55,141,161,133,44,139,4,146,190,153,115,142,84,146,58,59,131,17,12,224,157,47,124,74,63,234,125,219,85,101,163,181,139,53,153,248,248,109,234,99,230,81,120,182,200,206,48,106,42,100,64,70,50,196,26,29,121,237,152,29,132,121,91,239,118,85,217,146,115,7,136,70,52,32,107,8,173,118,218,33,91,71,194,18,0,129,37,131,154,29,153,176,72,187,121,85,130,28,103,233,225,11,246,128,0,22,17,152,44,176,209,136,76,82,130,44,33,152,144,86,139,170,252,82,196,12,232,108,202,20,34,189,144,106,90,131,84,207,152,102,100,32,54,232,77,17,102,233,161,89,253,207,146,121,215,146,133,208,116,105,217,59,170,117,188,156,152,136,130,22,163,98,96,165,173,54,210,204,103,71,44,24,81,97,60,26,45,146,52,80,216,166,223,251,102,155,150,105,213,245,21,26,68,194,56,67,27,69,194,203,203,
-203,24,53,28,147,178,162,5,65,116,19,202,154,248,176,104,60,120,227,208,1,91,77,198,138,245,77,189,173,151,189,147,153,166,216,251,112,35,55,40,176,144,68,193,137,126,227,165,0,136,9,153,37,72,35,63,187,208,245,112,230,50,228,71,126,32,33,177,1,235,193,106,107,180,56,33,44,80,130,132,236,95,174,33,172,214,219,101,221,86,229,211,221,179,42,213,211,19,230,87,50,25,202,133,140,53,141,225,66,149,59,136,231,231,170,188,156,216,168,213,205,213,237,215,171,205,102,221,172,186,131,233,234,249,249,67,149,143,28,20,31,114,159,12,97,12,99,17,121,1,234,100,239,239,189,132,92,227,122,221,46,210,246,62,220,31,31,84,80,229,27,198,170,127,100,172,238,170,242,146,255,105,154,55,130,108,157,34,155,253,172,109,230,175,204,132,227,17,155,206,126,165,121,87,101,29,62,170,233,190,107,215,235,71,181,76,169,107,86,15,31,235,183,162,227,124,132,37,183,147,249,53,142,235,33,146,187,248,124,24,39,248,150,136,186,61,52,85,55,169,251,185,94,168,239,205,
-238,36,144,222,59,247,179,0,213,31,182,42,237,99,
+120,156,173,148,219,110,218,64,16,134,95,101,37,154,8,34,74,119,246,224,93,219,55,68,61,164,85,19,37,18,189,179,156,96,192,77,221,24,59,197,203,77,163,228,217,59,107,108,236,36,16,64,42,138,236,224,157,127,230,255,102,198,4,140,188,123,71,251,180,67,119,124,188,79,241,207,104,153,154,48,72,132,208,126,196,164,127,247,253,210,245,173,30,80,207,21,112,45,57,8,230,224,5,56,48,201,184,0,205,92,161,57,215,212,155,166,81,81,132,65,202,180,46,69,172,207,58,76,73,6,74,104,161,129,43,205,80,203,40,101,84,49,9,130,107,38,189,89,92,76,195,128,98,56,199,26,174,195,93,10,148,42,0,202,153,162,92,10,0,206,48,5,83,12,168,244,226,108,22,6,95,29,223,10,132,133,146,14,90,119,48,155,16,20,179,91,153,224,192,41,227,18,92,233,120,147,248,54,201,54,33,201,157,72,138,122,137,137,231,21,81,36,252,147,161,244,1,165,78,223,233,40,44,43,36,22,115,45,17,71,25,99,142,116,65,10,180,36,40,243,22,241,159,101,178,136,
+231,113,102,170,12,9,0,3,127,2,202,71,11,79,79,79,3,16,116,213,41,133,94,128,162,111,6,248,12,57,20,72,151,186,82,131,166,92,9,38,21,162,223,71,139,104,94,145,76,4,243,43,14,221,215,29,7,28,236,40,213,232,95,186,152,128,34,4,222,177,145,18,255,184,246,76,37,182,58,43,114,251,110,7,155,196,37,85,46,85,66,73,129,36,12,28,192,70,82,203,143,99,240,178,124,49,143,210,48,120,184,121,36,1,121,120,0,187,37,195,46,14,100,32,216,128,246,72,80,80,255,232,136,4,39,67,229,11,114,113,122,245,237,244,254,62,79,50,83,66,135,143,143,199,161,13,41,29,151,125,31,118,233,128,14,208,100,143,146,214,217,122,46,222,139,28,99,111,188,218,42,143,4,141,150,147,106,211,56,185,9,131,19,254,170,178,61,240,240,168,45,185,95,78,210,100,90,107,134,220,95,201,46,39,191,227,169,9,173,25,215,39,151,75,147,230,249,29,153,199,177,73,178,219,15,81,147,116,96,67,56,54,111,229,219,222,234,150,124,233,2,211,189,179,242,58,
+132,166,43,228,99,158,21,102,177,156,154,124,65,102,177,137,146,180,110,138,40,19,20,114,35,241,203,71,221,113,207,179,233,94,98,118,123,54,7,179,197,170,87,151,76,155,138,149,225,189,140,94,149,205,33,23,177,249,149,207,200,121,82,152,189,140,158,197,102,180,44,27,88,121,188,185,30,153,5,54,238,154,172,238,225,13,38,111,162,218,142,241,105,81,247,153,20,171,243,150,229,157,133,207,243,105,100,146,60,219,81,185,14,219,90,58,173,2,170,218,120,188,23,182,137,22,230,71,50,143,215,229,237,151,107,98,175,107,232,58,102,59,182,141,32,6,67,14,33,255,156,205,118,84,174,34,182,214,197,31,209,178,234,190,69,71,173,57,151,27,86,53,121,124,92,90,104,94,51,50,201,243,180,116,49,106,13,189,29,80,202,49,226,245,188,198,199,246,181,36,197,223,90,215,152,31,109,216,21,146,100,36,56,122,255,92,114,192,16,71,237,21,218,31,170,217,167,3,169,214,194,45,88,245,30,62,227,90,139,14,3,107,109,231,138,172,252,255,237,97,53,203,186,25,172,189,
+101,21,148,153,111,157,209,122,177,91,56,24,126,24,198,122,209,247,133,88,239,253,127,64,168,223,145,183,0,202,159,207,240,31,8,193,201,169,
 
diff --git a/bazaar/MAPIEx/src.tpp/MAPIAttachment$en-us.tpp b/bazaar/MAPIEx/src.tpp/MAPIAttachment$en-us.tpp
new file mode 100644
index 000000000..7a5717302
--- /dev/null
+++ b/bazaar/MAPIEx/src.tpp/MAPIAttachment$en-us.tpp
@@ -0,0 +1,82 @@
+topic "class MAPIAttachment: public MAPIObject";
+[2 $$0,0#00000000000000000000000000000000:Default]
+[i448;a25;kKO9;2 $$1,0#37138531426314131252341829483380:class]
+[l288;2 $$2,2#27521748481378242620020725143825:desc]
+[0 $$3,0#96390100711032703541132217272105:end]
+[H6;0 $$4,0#05600065144404261032431302351956:begin]
+[i448;a25;kKO9;2 $$5,0#37138531426314131252341829483370:item]
+[l288;a4;*@5;1 $$6,6#70004532496200323422659154056402:requirement]
+[l288;i1121;b17;O9;~~~.1408;2 $$7,0#10431211400427159095818037425705:param]
+[i448;b42;O9;2 $$8,8#61672508125594000341940100500538:tparam]
+[b42;2 $$9,9#13035079074754324216151401829390:normal]
+[{_} 
+[ {{10000@(113.42.0) [s0;%% [*@7;4 MAPIAttachment]]}}&]
+[s0;i448;kKO9;@(0.0.255)0 &]
+[s0;i448;a25;kKO9;:MAPIAttachment`:`:class: [@(0.0.255)3 class][3 _][*3 MAPIAttachment][3 _:_][@(0.0.255)3 p
+ublic][3 _][*@3;3 MAPIObject]&]
+[s9; Outlook message attachment.&]
+[s3;2 &]
+[s0; &]
+[ {{10000F(128)G(128)@1 [s0;%% [* Constructor detail]]}}&]
+[s4; &]
+[s5;:MAPIAttachment`:`:MAPIAttachment`(`): [* MAPIAttachment]()&]
+[s2;%% Default constructor.&]
+[s3; &]
+[ {{10000F(128)G(128)@1 [s0;%% [* Public Method List]]}}&]
+[s4; &]
+[s5;:MAPIAttachment`:`:GetDisplayName`(`): [_^String^ String]_[* GetDisplayName]()&]
+[s2;%% &]
+[s3; &]
+[s4; &]
+[s5;:MAPIAttachment`:`:GetFileName`(`): [_^String^ String]_[* GetFileName]()&]
+[s2;%% &]
+[s3; &]
+[s4; &]
+[s5;:MAPIAttachment`:`:GetLongFileName`(`): [_^String^ String]_[* GetLongFileName]()&]
+[s2;%% &]
+[s3; &]
+[s4; &]
+[s5;:MAPIAttachment`:`:SetDisplayName`(const String`&`): [@(0.0.255) bool]_[* SetDisplayN
+ame]([@(0.0.255) const]_[_^String^ String]_`&[*@3 szDisplayName])&]
+[s2;%%  [%-*@3 szDisplayName].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIAttachment`:`:SetFileName`(const String`&`): [@(0.0.255) bool]_[* SetFileName]([@(0.0.255) c
+onst]_[_^String^ String]_`&[*@3 szFileName])&]
+[s2;%%  [%-*@3 szFileName].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIAttachment`:`:SetLongFileName`(const String`&`): [@(0.0.255) bool]_[* SetLongFil
+eName]([@(0.0.255) const]_[_^String^ String]_`&[*@3 szLongFileName])&]
+[s2;%%  [%-*@3 szLongFileName].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIAttachment`:`:LoadAttachment`(const String`&`): [@(0.0.255) bool]_[* LoadAttachm
+ent]([@(0.0.255) const]_[_^String^ String]_`&[*@3 szPath])&]
+[s2;%%  [%-*@3 szPath].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIAttachment`:`:SaveAttachment`(const String`&`): [@(0.0.255) bool]_[* SaveAttachm
+ent]([@(0.0.255) const]_[_^String^ String]_`&[*@3 szPath])&]
+[s2;%%  [%-*@3 szPath].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIAttachment`:`:OpenStream`(bool`): [@(0.0.255) bool]_[* OpenStream]([@(0.0.255) boo
+l]_[*@3 bCreate]_`=_[@(0.0.255) false])&]
+[s2;%%  [%-*@3 bCreate].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIAttachment`:`:Read`(BYTE`*`,int`): [@(0.0.255) int]_[* Read](BYTE[@(0.0.255) `*]_[*@3 p
+Data], [@(0.0.255) int]_[*@3 nCount])&]
+[s2;%%  [%-*@3 pData] [%-*@3 nCount].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIAttachment`:`:Write`(BYTE`*`,int`): [@(0.0.255) int]_[* Write](BYTE[@(0.0.255) `*]_
+[*@3 pData], [@(0.0.255) int]_[*@3 nCount])&]
+[s2;%%  [%-*@3 pData] [%-*@3 nCount].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIAttachment`:`:CloseStream`(`): [@(0.0.255) void]_[* CloseStream]()&]
+[s2;%% &]
+[s3; &]
+[s0;%% ]
\ No newline at end of file
diff --git a/bazaar/MAPIEx/src.tpp/MAPIAttachment$en-us.tppi b/bazaar/MAPIEx/src.tpp/MAPIAttachment$en-us.tppi
new file mode 100644
index 000000000..346ee4acf
--- /dev/null
+++ b/bazaar/MAPIEx/src.tpp/MAPIAttachment$en-us.tppi
@@ -0,0 +1,7 @@
+TITLE("class MAPIAttachment: public MAPIObject")
+COMPRESSED
+120,156,205,150,255,111,218,70,24,198,255,149,147,104,34,64,12,221,87,223,217,214,36,186,100,237,166,165,75,180,76,170,42,203,197,7,92,19,175,198,166,216,84,218,162,228,111,223,123,198,196,54,161,138,201,47,109,20,97,113,247,60,239,251,121,222,59,66,2,138,94,189,194,35,220,195,207,252,120,231,230,147,222,36,69,24,196,156,43,95,83,225,127,254,227,210,245,173,159,128,159,73,194,148,96,132,83,7,94,8,35,84,80,198,137,162,46,87,140,41,236,205,19,157,231,97,144,80,165,74,19,29,209,30,149,130,18,201,21,87,132,73,69,193,75,49,166,88,82,65,56,83,84,120,11,147,207,195,0,131,156,65,15,215,97,46,38,24,75,66,48,163,18,51,193,9,97,20,74,80,73,9,22,158,73,23,97,240,155,227,91,3,183,161,132,3,232,14,84,227,28,67,117,107,227,140,48,76,153,32,174,112,188,153,185,137,211,67,145,196,179,145,36,246,226,194,44,171,68,154,251,195,137,240,9,88,157,145,211,147,208,150,11,104,230,218,68,12,108,148,58,194,37,130,3,18,
+199,212,91,155,47,155,120,109,150,38,45,170,10,49,33,148,248,51,34,125,64,120,120,120,24,19,142,183,147,146,192,66,48,112,83,2,107,144,67,18,225,98,87,40,162,48,147,156,10,9,209,87,122,173,151,85,146,25,167,126,149,67,141,84,207,33,14,76,20,43,224,23,46,20,192,16,2,158,48,72,1,191,76,121,69,101,182,62,107,114,71,110,15,134,196,4,150,46,150,92,10,14,73,40,113,8,12,18,219,252,112,12,94,154,173,151,58,9,131,187,233,61,10,208,221,29,177,183,100,210,135,3,25,115,58,198,3,20,228,216,63,57,65,193,112,34,125,142,222,189,190,250,253,117,81,232,249,109,153,57,188,191,63,13,173,162,4,46,199,62,233,227,49,30,3,227,0,163,198,222,227,177,120,237,18,145,23,109,239,148,135,130,218,202,80,117,207,24,154,134,193,144,237,247,181,235,30,236,52,29,171,205,44,137,231,59,203,132,249,91,215,229,236,31,51,47,66,139,226,250,232,114,83,36,89,246,25,45,77,158,235,27,131,244,99,205,177,85,48,24,220,22,218,62,118,227,
+120,211,39,84,13,222,150,175,19,82,79,4,157,101,105,94,172,55,243,34,91,163,133,41,116,156,236,38,194,203,2,185,56,20,119,111,165,31,13,60,91,108,47,98,127,96,11,80,219,169,250,204,162,121,221,174,162,237,68,121,85,14,6,189,51,197,109,182,64,23,113,94,116,161,124,107,138,243,56,95,37,250,223,63,245,210,84,148,211,143,215,197,58,78,111,62,162,237,51,156,66,253,182,178,9,94,67,62,215,234,77,156,152,14,125,118,178,151,53,185,200,210,155,142,141,154,210,23,52,187,222,27,94,121,114,85,139,232,180,236,92,95,93,52,203,178,164,108,124,189,55,201,166,168,44,1,170,167,196,209,169,189,238,40,255,175,233,173,145,81,112,242,211,211,253,234,2,85,145,158,201,82,15,173,123,144,122,122,71,166,120,52,30,138,240,184,121,20,127,251,224,187,103,104,223,130,35,115,180,204,135,178,180,4,221,243,92,100,122,209,252,243,209,49,78,219,118,116,154,43,93,220,30,76,81,110,28,113,26,250,171,121,1,125,219,246,221,232,47,87,38,133,226,70,47,163,
+190,101,251,38,111,45,108,179,238,4,208,124,118,6,219,133,1,202,159,167,77,201,39,157,228,135,46,204,78,223,157,246,47,163,23,81,255,151,15,127,255,26,13,163,81,12,139,123,184,176,84,210,90,97,88,10,155,187,209,176,34,93,157,235,66,135,163,67,86,216,77,207,178,13,188,121,10,188,181,237,222,85,178,238,244,239,215,240,143,89,39,252,82,249,195,241,159,37,89,110,118,151,101,31,253,107,22,47,74,246,134,234,27,223,51,229,215,120,248,63,205,59,123,185,
+
diff --git a/bazaar/MAPIEx/src.tpp/MAPIContact$en-us.tpp b/bazaar/MAPIEx/src.tpp/MAPIContact$en-us.tpp
index 310986ed7..cfe62a815 100644
--- a/bazaar/MAPIEx/src.tpp/MAPIContact$en-us.tpp
+++ b/bazaar/MAPIEx/src.tpp/MAPIContact$en-us.tpp
@@ -1,4 +1,4 @@
-topic "class MAPIFolder : public MAPIObject";
+topic "class MAPIContact : public MAPIObject";
 [2 $$0,0#00000000000000000000000000000000:Default]
 [i448;a25;kKO9;2 $$1,0#37138531426314131252341829483380:class]
 [l288;2 $$2,2#27521748481378242620020725143825:desc]
@@ -12,12 +12,245 @@ topic "class MAPIFolder : public MAPIObject";
 [{_} 
 [ {{10000@(113.42.0) [s0;%% [*@7;4 MAPIContact]]}}&]
 [s0;i448;kKO9;@(0.0.255)0 &]
-[s0;i448;a25;kKO9;:MAPIFolder`:`:class: [@(0.0.255)3 class][3 _][*3 MAPIContact][3 _:_][@(0.0.255)3 p
+[s0;i448;a25;kKO9;:MAPIContact`:`:class: [@(0.0.255)3 class][3 _][*3 MAPIContact][3 _:_][@(0.0.255)3 p
 ublic][3 _][*@3;3 MAPIObject]&]
 [s9; Outlook contact.&]
 [s3;2 &]
-[s3;2 &]
-[ {{10000F(128)G(128)@1 [s0;%% [* Public Method List]]}}&]
 [s0; &]
-[s0;3 &]
+[ {{10000F(128)G(128)@1 [s0;%% [* Constructor detail]]}}&]
+[s4; &]
+[s5;:MAPIContact`:`:MAPIContact`(`): [* MAPIContact]()&]
+[s2;%% Default constructor.&]
+[s3; &]
+[ {{10000F(128)G(128)@1 [s0;%% [* Public Method List]]}}&]
+[s4; &]
+[s5;:MAPIContact`:`:GetName`(ULONG`): [_^String^ String]_[* GetName](ULONG_[*@3 ulNameID]_`=
+_PR`_DISPLAY`_NAME)&]
+[s2;%%  [%-*@3 ulNameID].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIContact`:`:GetEmail`(int`): [_^String^ String]_[* GetEmail]([@(0.0.255) int]_[*@3 nI
+ndex]_`=_[@3 1])&]
+[s2;%%  [%-*@3 nIndex].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIContact`:`:GetEmailDisplayAs`(int`): [_^String^ String]_[* GetEmailDisplayAs]([@(0.0.255) i
+nt]_[*@3 nIndex]_`=_[@3 1])&]
+[s2;%%  [%-*@3 nIndex].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIContact`:`:GetHomePage`(bool`): [_^String^ String]_[* GetHomePage]([@(0.0.255) boo
+l]_[*@3 bBusiness]_`=_[@(0.0.255) true])&]
+[s2;%%  [%-*@3 bBusiness].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIContact`:`:GetPhoneNumber`(ULONG`): [_^String^ String]_[* GetPhoneNumber](ULONG_
+[*@3 ulPhoneNumberID])&]
+[s2;%%  [%-*@3 ulPhoneNumberID].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIContact`:`:GetAddress`(ContactAddress`&`,AddressType`): [@(0.0.255) bool]_[* Get
+Address]([_^ContactAddress^ ContactAddress][@(0.0.255) `&]_[*@3 address], 
+ContactAddress`::AddressType_[*@3 nType])&]
+[s2;%%  [%-*@3 address] [%-*@3 nType].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIContact`:`:GetPostalAddress`(`): [_^String^ String]_[* GetPostalAddress]()&]
+[s2;%% &]
+[s3; &]
+[s4; &]
+[s5;:MAPIContact`:`:GetIMAddress`(`): [_^String^ String]_[* GetIMAddress]()&]
+[s2;%% &]
+[s3; &]
+[s4; &]
+[s5;:MAPIContact`:`:GetFileAs`(`): [_^String^ String]_[* GetFileAs]()&]
+[s2;%% &]
+[s3; &]
+[s4; &]
+[s5;:MAPIContact`:`:GetTitle`(`): [_^String^ String]_[* GetTitle]()&]
+[s2;%% &]
+[s3; &]
+[s4; &]
+[s5;:MAPIContact`:`:GetCompany`(`): [_^String^ String]_[* GetCompany]()&]
+[s2;%% &]
+[s3; &]
+[s4; &]
+[s5;:MAPIContact`:`:GetProfession`(`): [_^String^ String]_[* GetProfession]()&]
+[s2;%% &]
+[s3; &]
+[s4; &]
+[s5;:MAPIContact`:`:GetDisplayNamePrefix`(`): [_^String^ String]_[* GetDisplayNamePrefix](
+)&]
+[s2;%% &]
+[s3; &]
+[s4; &]
+[s5;:MAPIContact`:`:GetGeneration`(`): [_^String^ String]_[* GetGeneration]()&]
+[s2;%% &]
+[s3; &]
+[s4; &]
+[s5;:MAPIContact`:`:GetDepartment`(`): [_^String^ String]_[* GetDepartment]()&]
+[s2;%% &]
+[s3; &]
+[s4; &]
+[s5;:MAPIContact`:`:GetOffice`(`): [_^String^ String]_[* GetOffice]()&]
+[s2;%% &]
+[s3; &]
+[s4; &]
+[s5;:MAPIContact`:`:GetManagerName`(`): [_^String^ String]_[* GetManagerName]()&]
+[s2;%% &]
+[s3; &]
+[s4; &]
+[s5;:MAPIContact`:`:GetAssistantName`(`): [_^String^ String]_[* GetAssistantName]()&]
+[s2;%% &]
+[s3; &]
+[s4; &]
+[s5;:MAPIContact`:`:GetNickName`(`): [_^String^ String]_[* GetNickName]()&]
+[s2;%% &]
+[s3; &]
+[s4; &]
+[s5;:MAPIContact`:`:GetSpouseName`(`): [_^String^ String]_[* GetSpouseName]()&]
+[s2;%% &]
+[s3; &]
+[s4; &]
+[s5;:MAPIContact`:`:GetBirthday`(`): [_^Time^ Time]_[* GetBirthday]()&]
+[s2;%% &]
+[s3; &]
+[s4; &]
+[s5;:MAPIContact`:`:GetAnniversary`(`): [_^Time^ Time]_[* GetAnniversary]()&]
+[s2;%% &]
+[s3; &]
+[s4; &]
+[s5;:MAPIContact`:`:GetCategories`(`): [_^String^ String]_[* GetCategories]()&]
+[s2;%% &]
+[s3; &]
+[s4; &]
+[s5;:MAPIContact`:`:SetName`(const String`&`,ULONG`): [@(0.0.255) bool]_[* SetName]([@(0.0.255) c
+onst]_[_^String^ String]_`&[*@3 szName], ULONG_[*@3 ulNameID]_`=_PR`_DISPLAY`_NAME)&]
+[s2;%%  [%-*@3 szName] [%-*@3 ulNameID].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIContact`:`:SetEmail`(const String`&`,int`): [@(0.0.255) bool]_[* SetEmail]([@(0.0.255) c
+onst]_[_^String^ String]_`&[*@3 szEmail], [@(0.0.255) int]_[*@3 nIndex]_`=_[@3 1])&]
+[s2;%%  [%-*@3 szEmail] [%-*@3 nIndex].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIContact`:`:SetEmailDisplayAs`(const String`&`,int`): [@(0.0.255) bool]_[* SetEma
+ilDisplayAs]([@(0.0.255) const]_[_^String^ String]_`&[*@3 szDisplayAs], 
+[@(0.0.255) int]_[*@3 nIndex]_`=_[@3 1])&]
+[s2;%%  [%-*@3 szDisplayAs] [%-*@3 nIndex].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIContact`:`:SetHomePage`(const String`&`,bool`): [@(0.0.255) bool]_[* SetHomePage
+]([@(0.0.255) const]_[_^String^ String]_`&[*@3 szHomePage], [@(0.0.255) bool]_[*@3 bBusines
+s]_`=_[@(0.0.255) true])&]
+[s2;%%  [%-*@3 szHomePage] [%-*@3 bBusiness].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIContact`:`:SetPhoneNumber`(const String`&`,ULONG`): [@(0.0.255) bool]_[* SetPhon
+eNumber]([@(0.0.255) const]_[_^String^ String]_`&[*@3 szPhoneNumber], 
+ULONG_[*@3 ulPhoneNumberID])&]
+[s2;%%  [%-*@3 szPhoneNumber] [%-*@3 ulPhoneNumberID].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIContact`:`:SetAddress`(ContactAddress`&`,AddressType`): [@(0.0.255) bool]_[* Set
+Address]([_^ContactAddress^ ContactAddress][@(0.0.255) `&]_[*@3 address], 
+ContactAddress`::AddressType_[*@3 nType])&]
+[s2;%%  [%-*@3 address] [%-*@3 nType].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIContact`:`:SetPostalAddress`(AddressType`): [@(0.0.255) bool]_[* SetPostalAddres
+s](ContactAddress`::AddressType_[*@3 nType])&]
+[s2;%% Sets contact postal address type from [%-*@3 nType].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIContact`:`:SetNotes`(const String`&`,bool`): [@(0.0.255) bool]_[* SetNotes]([@(0.0.255) c
+onst]_[_^String^ String]_`&[*@3 szNotes], [@(0.0.255) bool]_[*@3 bRTF][@(0.0.255) `=false])
+&]
+[s2;%% Sets contact notes from [%-*@3 szNotes]. In [%-*@3 bRTF] it indicates 
+if text is RTF.&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIContact`:`:SetFileAs`(const String`&`): [@(0.0.255) bool]_[* SetFileAs]([@(0.0.255) c
+onst]_[_^String^ String]_`&[*@3 szFileAs])&]
+[s2;%% Sets contact file as from [%-*@3 szFileAs].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIContact`:`:SetTitle`(const String`&`): [@(0.0.255) bool]_[* SetTitle]([@(0.0.255) c
+onst]_[_^String^ String]_`&[*@3 szTitle])&]
+[s2;%% Sets contact title from [%-*@3 szTitle].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIContact`:`:SetCompany`(const String`&`): [@(0.0.255) bool]_[* SetCompany]([@(0.0.255) c
+onst]_[_^String^ String]_`&[*@3 szCompany])&]
+[s2;%% Sets contact company from [%-*@3 szCompany].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIContact`:`:SetProfession`(const String`&`): [@(0.0.255) bool]_[* SetProfession](
+[@(0.0.255) const]_[_^String^ String]_`&[*@3 szProfession])&]
+[s2;%% Sets contact profession from [%-*@3 szProfession].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIContact`:`:SetDisplayNamePrefix`(const String`&`): [@(0.0.255) bool]_[* SetDispl
+ayNamePrefix]([@(0.0.255) const]_[_^String^ String]_`&[*@3 szPrefix])&]
+[s2;%% Sets contact display name prefix from [%-*@3 szPrefix].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIContact`:`:SetGeneration`(const String`&`): [@(0.0.255) bool]_[* SetGeneration](
+[@(0.0.255) const]_[_^String^ String]_`&[*@3 szGeneration])&]
+[s2;%% Sets contact generation from [%-*@3 szGeneration].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIContact`:`:SetDepartment`(const String`&`): [@(0.0.255) bool]_[* SetDepartment](
+[@(0.0.255) const]_[_^String^ String]_`&[*@3 szDepartment])&]
+[s2;%% Sets contact department from [%-*@3 szDepartment].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIContact`:`:SetOffice`(const String`&`): [@(0.0.255) bool]_[* SetOffice]([@(0.0.255) c
+onst]_[_^String^ String]_`&[*@3 szOffice])&]
+[s2;%% Sets contact office from [%-*@3 szOffice].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIContact`:`:SetManagerName`(const String`&`): [@(0.0.255) bool]_[* SetManagerName
+]([@(0.0.255) const]_[_^String^ String]_`&[*@3 szManagerName])&]
+[s2;%% Sets contact manager name from [%-*@3 szManagerName].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIContact`:`:SetAssistantName`(const String`&`): [@(0.0.255) bool]_[* SetAssistant
+Name]([@(0.0.255) const]_[_^String^ String]_`&[*@3 szAssistantName])&]
+[s2;%% Sets contact assistant name from [%-*@3 szAssistantName].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIContact`:`:SetNickName`(const String`&`): [@(0.0.255) bool]_[* SetNickName]([@(0.0.255) c
+onst]_[_^String^ String]_`&[*@3 szNickName])&]
+[s2;%% Sets contact nickname from [%-*@3 szNickName].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIContact`:`:SetSpouseName`(const String`&`): [@(0.0.255) bool]_[* SetSpouseName](
+[@(0.0.255) const]_[_^String^ String]_`&[*@3 szSpouseName])&]
+[s2;%% Sets contact spouse name from [%-*@3 szSpouseName].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIContact`:`:SetBirthday`(const Time`&`): [@(0.0.255) bool]_[* SetBirthday]([@(0.0.255) c
+onst]_[_^Time^ Time]_`&[*@3 tm])&]
+[s2;%% Sets contact birthday from [%-*@3 tm].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIContact`:`:SetAnniversary`(const Time`&`): [@(0.0.255) bool]_[* SetAnniversary](
+[@(0.0.255) const]_[_^Time^ Time]_`&[*@3 tm])&]
+[s2;%% Sets contact anniversary from [%-*@3 tm].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIContact`:`:SetCategories`(const String`&`): [@(0.0.255) bool]_[* SetCategories](
+[@(0.0.255) const]_[_^String^ String]_`&[*@3 szCategories])&]
+[s2;%% Sets contact categories from [%-*@3 szCategories].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIContact`:`:HasPicture`(`): [@(0.0.255) bool]_[* HasPicture]()&]
+[s2;%% Indicates if contact has a picture.&]
+[s3; &]
+[s4; &]
+[s5;:MAPIContact`:`:SetPicture`(const String`&`): [@(0.0.255) bool]_[* SetPicture]([@(0.0.255) c
+onst]_[_^String^ String]_`&[*@3 szPath])&]
+[s2;%% Sets contact picture from image file in [%-*@3 szPath].&]
+[s3;%% &]
 [s0;%% ]
\ No newline at end of file
diff --git a/bazaar/MAPIEx/src.tpp/MAPIContact$en-us.tppi b/bazaar/MAPIEx/src.tpp/MAPIContact$en-us.tppi
index db4ceb761..28c29e218 100644
--- a/bazaar/MAPIEx/src.tpp/MAPIContact$en-us.tppi
+++ b/bazaar/MAPIEx/src.tpp/MAPIContact$en-us.tppi
@@ -1,6 +1,10 @@
-TITLE("class MAPIFolder : public MAPIObject")
+TITLE("class MAPIContact : public MAPIObject")
 COMPRESSED
-120,156,133,146,93,111,218,48,20,134,255,138,37,218,9,16,138,206,135,29,127,221,48,109,234,54,109,21,189,143,162,54,64,182,101,13,208,65,184,170,224,183,239,24,210,149,73,147,26,69,182,100,251,57,231,125,95,187,32,117,117,5,19,24,192,27,95,248,88,127,175,246,109,87,22,141,214,46,86,100,226,227,215,153,143,137,71,225,217,34,59,195,168,41,151,1,25,201,16,107,116,228,181,99,118,16,22,109,181,219,149,69,75,206,157,32,154,208,128,172,33,180,218,105,135,108,29,9,75,0,4,150,12,106,118,100,194,178,222,45,202,2,228,56,75,15,159,179,7,4,176,136,192,100,129,141,70,100,146,18,100,9,193,132,122,189,44,139,207,121,76,128,78,166,76,46,210,115,169,166,53,72,245,132,105,70,6,98,131,222,228,97,94,255,104,214,255,179,100,222,180,100,33,52,93,189,234,29,85,58,142,167,38,162,160,249,36,31,88,105,171,141,52,243,201,17,11,70,148,27,143,70,139,36,13,20,182,245,239,125,179,173,87,245,186,235,43,52,136,132,113,142,54,138,132,227,
-241,152,161,134,115,82,86,180,32,136,110,66,89,19,31,22,141,7,111,28,58,96,171,201,88,177,254,84,109,171,85,239,100,174,41,246,62,220,196,13,114,204,37,81,112,162,223,120,41,0,98,66,102,9,210,200,207,46,116,61,156,184,4,249,137,31,72,72,108,192,122,176,218,26,45,78,8,115,148,32,33,249,151,107,8,235,205,118,85,181,101,241,124,127,80,133,122,126,198,244,74,166,67,185,144,76,83,6,35,85,236,32,94,95,171,98,60,181,81,171,219,247,119,95,62,108,214,93,181,232,202,242,112,120,87,166,237,147,218,83,230,211,33,100,144,137,192,17,168,139,189,191,119,18,18,127,179,105,151,245,246,33,60,156,31,83,80,197,43,198,170,127,96,172,238,203,98,204,255,52,76,139,65,150,47,143,63,237,231,109,179,120,57,63,229,120,70,102,243,95,181,16,73,131,143,106,182,239,218,205,230,81,45,206,133,178,180,204,146,209,197,252,98,253,102,136,228,70,159,78,227,20,95,221,171,187,83,35,117,91,119,63,55,75,245,173,217,93,4,208,123,229,126,22,160,252,
-3,192,16,229,2,
+120,156,221,90,109,111,155,72,16,254,43,43,165,141,156,202,23,237,46,96,48,86,165,164,77,155,68,215,36,86,157,251,112,178,136,141,237,117,194,213,6,31,224,83,123,85,251,219,111,150,215,133,128,89,200,233,62,92,85,197,49,251,60,51,243,204,46,48,51,202,148,162,87,175,112,31,31,225,134,127,230,5,91,219,251,77,104,77,29,85,53,70,54,213,70,95,126,189,27,142,56,159,0,95,209,137,98,104,10,81,233,0,126,16,133,80,141,42,42,49,232,80,53,20,197,192,230,114,99,7,129,53,221,80,195,136,72,180,79,143,168,174,81,162,171,134,106,16,69,55,40,112,41,198,20,235,84,35,170,98,80,205,92,177,96,105,77,49,192,21,240,49,28,40,67,76,48,214,9,193,10,213,177,162,169,132,40,20,76,80,157,18,172,153,204,93,89,211,171,193,136,19,84,46,74,27,64,232,3,176,166,170,24,172,115,154,170,16,5,83,69,35,67,109,96,46,216,163,227,86,73,210,26,37,233,216,116,66,182,77,20,217,234,232,205,153,54,34,64,29,244,7,71,58,184,85,
+53,112,54,228,138,20,160,81,58,208,134,68,83,33,36,21,83,211,103,127,238,29,159,109,153,27,38,22,28,66,40,25,45,136,62,130,16,126,254,252,121,74,84,28,103,74,135,88,8,134,184,41,129,107,160,67,39,218,16,15,53,131,24,88,209,85,170,233,32,125,103,251,246,54,81,178,80,233,40,209,97,244,141,163,1,25,64,70,177,1,241,107,67,48,128,65,4,124,66,34,53,248,175,24,102,152,144,57,143,147,134,253,225,17,36,73,209,176,62,196,186,170,107,42,40,161,100,64,32,145,152,235,135,109,48,93,207,223,218,27,107,250,125,246,3,77,209,247,239,132,159,146,179,30,108,200,169,74,79,241,9,154,6,120,244,250,53,154,190,57,211,71,42,186,57,31,95,191,247,220,208,94,134,150,245,227,199,177,197,151,163,104,163,156,159,245,240,41,62,133,0,79,48,18,214,178,61,49,5,254,220,156,199,167,201,68,211,156,167,160,228,132,41,104,102,77,223,40,5,143,252,162,9,151,69,248,110,191,216,56,203,20,127,166,140,98,202,221,226,15,6,12,30,196,112,132,
+238,246,225,198,243,190,160,101,108,232,148,95,86,32,73,113,140,252,35,149,254,177,71,168,113,114,25,253,60,35,185,122,4,49,4,161,191,95,134,158,143,86,44,180,157,77,154,0,53,50,16,104,207,212,137,95,123,243,19,147,155,17,229,244,78,56,143,114,7,201,109,201,3,76,189,36,65,74,5,55,142,146,128,110,88,248,228,173,208,39,39,8,27,131,187,100,225,173,189,101,243,222,111,159,238,110,47,163,232,102,15,147,208,119,220,199,7,20,127,90,51,48,157,224,172,24,55,227,41,70,251,13,191,116,125,97,205,230,111,103,227,207,243,217,197,245,100,252,233,252,247,249,236,246,252,230,67,174,10,77,95,255,82,192,39,154,96,169,41,182,15,91,200,240,188,231,184,225,193,208,34,152,213,19,78,4,2,138,21,135,233,94,187,43,246,53,10,114,10,95,137,245,60,178,4,210,50,174,11,39,216,109,236,111,231,129,100,128,25,254,191,140,244,202,219,178,177,253,8,59,188,240,188,205,193,32,83,104,49,60,78,75,226,91,188,219,7,142,203,224,190,140,67,204,65,112,
+88,89,69,180,57,65,62,224,241,147,231,178,219,253,118,193,124,153,83,41,192,75,135,83,88,129,51,87,117,28,139,8,249,16,207,87,43,31,68,205,123,201,229,244,251,241,188,159,252,122,255,109,199,162,176,43,18,137,114,11,144,233,217,67,209,200,3,42,126,23,31,115,104,126,156,236,132,157,44,246,75,232,185,105,10,17,36,167,138,255,90,161,63,181,145,29,173,8,215,98,163,188,32,180,55,89,46,14,239,146,136,21,159,120,249,211,237,160,175,235,27,57,63,25,174,131,143,143,206,134,157,55,57,136,65,29,172,223,59,225,134,53,24,143,48,29,108,191,247,182,59,219,253,214,96,61,65,117,176,63,246,189,53,228,212,241,220,166,109,206,128,29,188,36,143,71,254,142,24,251,108,237,124,109,112,246,12,223,193,231,37,115,153,111,135,205,202,114,96,23,101,12,106,178,144,151,135,77,146,50,96,7,47,119,235,181,179,108,58,98,49,168,131,245,27,219,133,87,131,31,23,11,7,93,8,200,14,126,206,225,248,192,179,194,13,37,60,21,176,29,124,221,58,203,47,18,
+110,82,88,7,15,147,157,183,15,152,132,143,28,216,193,203,59,199,15,159,86,118,254,0,184,119,182,236,1,241,159,169,253,20,210,101,71,92,215,249,139,249,129,237,31,114,32,160,186,60,193,236,144,61,122,190,195,154,158,191,57,176,173,151,73,90,233,70,197,117,98,150,191,178,243,26,163,234,101,61,73,11,95,113,53,50,1,203,207,163,156,31,71,239,220,224,239,136,212,71,47,40,151,19,27,93,171,231,73,86,61,151,5,167,197,106,141,220,138,98,90,66,111,204,234,163,206,149,109,106,162,91,165,59,121,94,147,119,145,93,83,162,75,232,207,153,47,202,65,110,166,115,30,242,138,191,156,129,172,3,168,73,65,117,3,32,33,62,35,246,43,109,119,105,29,4,163,157,187,137,73,169,155,104,125,231,23,154,139,150,57,17,185,165,231,64,83,103,82,36,191,176,95,153,188,184,95,153,252,15,250,149,201,179,126,69,82,121,169,115,105,31,62,216,8,210,137,19,218,69,214,82,41,40,4,40,90,251,222,182,171,166,91,47,100,21,143,186,166,27,61,162,181,127,165,69,
+172,250,91,252,243,253,199,226,238,191,93,219,155,160,54,23,46,55,87,80,159,186,56,69,215,110,118,211,115,171,200,9,225,65,186,114,150,54,167,56,107,20,178,175,112,37,64,176,40,159,172,180,193,43,101,235,64,158,210,110,175,101,162,18,90,141,238,53,172,34,187,172,60,225,200,171,73,26,74,121,49,73,119,217,82,75,204,170,145,18,242,197,146,144,152,32,175,35,107,94,229,149,100,157,108,75,45,41,175,70,205,50,94,46,233,73,73,45,30,52,66,187,44,47,74,236,157,219,190,106,114,106,221,115,39,67,148,212,9,84,121,129,21,157,186,188,206,138,182,189,181,220,136,86,35,117,21,219,71,46,56,0,221,28,250,76,115,196,151,215,43,78,9,228,133,138,35,131,150,10,5,106,141,202,199,12,81,18,39,80,91,108,168,48,160,104,177,147,194,180,162,109,181,156,83,235,182,49,67,148,4,10,84,121,129,233,108,68,94,92,58,40,105,41,44,161,213,136,242,162,213,146,160,132,34,47,166,48,138,145,87,84,152,203,180,148,37,114,107,180,109,99,72,124,223,21,
+21,138,236,22,85,107,113,18,36,47,180,52,22,106,41,181,200,174,17,107,167,160,42,185,69,11,45,138,185,108,28,37,175,53,159,77,181,45,230,82,98,93,117,6,235,21,218,50,154,188,44,113,6,38,47,76,28,136,181,148,38,80,107,196,5,17,162,106,239,4,174,188,194,124,254,22,235,227,115,177,195,234,242,113,92,181,54,113,190,150,232,10,183,117,106,22,137,177,130,20,128,183,184,213,196,17,159,172,134,194,196,239,95,144,97,231,246,186,43,17,7,137,45,10,74,97,170,216,182,166,204,169,117,101,101,134,40,87,150,57,85,82,224,149,29,140,157,101,184,247,211,113,114,149,158,28,36,142,72,175,197,246,41,13,237,9,218,16,27,237,98,180,240,151,6,135,203,219,52,130,22,181,109,26,79,219,74,207,14,159,106,75,218,216,102,156,83,103,11,47,152,184,179,114,92,161,210,227,252,98,110,163,191,149,176,254,1,189,107,170,57,
 
diff --git a/bazaar/MAPIEx/src.tpp/MAPIEx$en-us.tpp b/bazaar/MAPIEx/src.tpp/MAPIEx$en-us.tpp
index cac5ec747..ee09985aa 100644
--- a/bazaar/MAPIEx/src.tpp/MAPIEx$en-us.tpp
+++ b/bazaar/MAPIEx/src.tpp/MAPIEx$en-us.tpp
@@ -15,7 +15,12 @@ topic "MAPIEx";
 [s1;:MAPIEx`:`:class: [@(0.0.255)3 class][3 _][*3 MAPIEx]&]
 [s9;%% MAPIEx base class.&]
 [s3;2 &]
-[s3;2 &]
+[s0; &]
+[ {{10000F(128)G(128)@1 [s0;%% [* Constructor detail]]}}&]
+[s4; &]
+[s5;:MAPIEx`:`:MAPIEx`(`): [* MAPIEx]()&]
+[s2;%% Default constructor.&]
+[s3; &]
 [ {{10000F(128)G(128)@1 [s0;%% [* Public Method List]]}}&]
 [s4; &]
 [s5;:MAPIEx`:`:Login`(const String`,DWORD`,bool`): [@(0.0.255) bool]_[* Login]([@(0.0.255) c
@@ -44,7 +49,7 @@ nt]_[*@3 nIndex], ULONG_[*@3 ulFlags][@(0.0.255) `=]MAPI`_MODIFY_`|_MAPI`_NO`_CA
 `_MODIFY_`|_MAPI`_NO`_CACHE)&]
 [s2;%% Opens message store with name [%-*@3 szStore] with flags [%-*@3 ulFlags].&]
 [s3;%% &]
-[s4;%% &]
+[s4; &]
 [s5;:MAPIEx`:`:GetMessageStoreCount`(`): [@(0.0.255) int]_[* GetMessageStoreCount]()&]
 [s2;%% Gets the messages number of opened message store.&]
 [s3; &]
@@ -56,9 +61,9 @@ etMessageStoreProperties]([@(0.0.255) int]_[*@3 nIndex], [_^String^ String][@(0.
 name in [%-*@3 strName] and if it is the default store in [%-*@3 bDefaultStore].&]
 [s3;%% &]
 [s4;%% &]
-[s5;:MAPIEx`:`:OpenFolder`(const String`,MAPIFolder`&`): [@(0.0.255) bool]_[* OpenFolder](
-[@(0.0.255) const]_[_^String^ String]_[*@3 folderName], [_^MAPIFolder^ MAPIFolder]_`&[*@3 f
-older])&]
+[s5;:MAPIEx`:`:OpenFolder`(const String`&`,MAPIFolder`&`): [@(0.0.255) bool]_[* OpenFolde
+r]([@(0.0.255) const]_[_^String^ String `&][*@3 folderName], [_^MAPIFolder^ MAPIFolder]_`&
+[*@3 folder])&]
 [s2;%% Sets in [%-*@3 folder] the folder with name [%-*@3 folderName].&]
 [s3;%% &]
 [s4; &]
diff --git a/bazaar/MAPIEx/src.tpp/MAPIEx$en-us.tppi b/bazaar/MAPIEx/src.tpp/MAPIEx$en-us.tppi
index d7c49b952..3d2826486 100644
--- a/bazaar/MAPIEx/src.tpp/MAPIEx$en-us.tppi
+++ b/bazaar/MAPIEx/src.tpp/MAPIEx$en-us.tppi
@@ -1,11 +1,11 @@
 TITLE("MAPIEx")
 COMPRESSED
-120,156,173,88,11,115,226,54,16,254,43,154,73,47,37,55,28,177,252,192,6,218,78,82,146,92,153,146,144,185,220,181,211,97,28,252,18,193,141,177,168,37,146,92,175,119,191,189,171,135,193,16,18,66,155,76,6,176,181,187,250,190,111,87,107,201,67,19,125,247,157,81,55,246,140,45,127,237,19,50,14,231,25,247,135,169,109,123,157,208,116,58,183,191,14,90,29,225,143,193,223,114,177,229,57,22,182,205,38,124,96,11,155,142,105,217,216,51,91,182,103,89,158,209,142,179,144,49,127,152,153,158,39,157,204,186,185,103,186,142,137,93,219,179,61,108,185,158,9,190,166,97,152,134,107,58,216,182,60,211,105,39,132,197,254,208,0,115,11,230,104,53,173,150,129,13,195,197,216,176,76,215,176,28,27,99,203,132,16,166,107,98,195,105,147,60,241,135,191,52,59,194,193,22,164,156,38,64,111,66,52,219,54,32,186,112,179,45,108,25,166,229,224,150,211,108,71,228,38,205,55,81,114,182,82,114,141,118,202,201,84,51,10,237,206,219,35,167,131,193,181,89,111,238,185,48,
-173,237,192,100,45,193,200,2,55,211,108,58,45,236,216,0,201,54,204,118,65,254,154,167,5,153,146,156,235,8,41,198,38,238,68,216,237,0,132,111,223,190,53,176,109,40,165,92,192,130,13,192,109,98,184,7,60,92,236,180,140,150,227,97,207,176,92,219,116,92,160,62,11,139,112,170,153,68,182,217,209,60,188,186,183,215,196,77,80,212,240,0,191,211,130,0,6,144,128,111,16,210,129,127,203,107,115,237,44,252,132,83,171,222,218,3,145,44,199,112,91,134,107,187,142,13,76,76,220,196,32,164,33,248,67,26,218,57,45,166,97,230,15,191,140,190,162,33,250,242,5,139,42,57,170,65,66,26,182,217,48,14,208,144,25,157,246,73,22,180,3,149,251,246,155,55,104,248,246,200,237,216,232,252,248,178,119,250,224,251,95,191,238,251,67,102,117,144,248,194,157,182,186,191,244,64,195,163,154,209,48,26,0,252,192,66,186,130,44,52,242,135,111,173,50,136,112,109,117,32,182,186,70,81,200,136,50,109,168,224,38,170,124,151,64,207,106,216,244,14,222,203,207,35,44,177,
-74,120,232,114,30,101,105,140,206,9,159,208,4,245,83,198,75,152,182,130,233,84,97,246,41,212,79,80,139,105,206,56,186,226,69,154,223,4,245,147,223,7,31,78,130,122,68,105,22,28,172,112,64,226,158,63,130,105,164,163,95,171,142,201,32,48,56,186,86,129,174,117,64,97,127,100,33,246,247,101,65,199,105,70,46,194,41,241,71,193,143,163,139,79,253,126,29,201,217,148,73,114,127,150,133,55,76,14,14,225,218,240,235,27,103,135,161,168,151,167,252,152,93,145,226,46,141,137,246,88,90,142,195,140,17,255,64,240,53,75,109,81,38,48,163,241,60,143,121,74,243,198,98,240,35,69,241,36,204,111,8,74,84,143,64,178,158,8,39,5,131,17,18,223,162,148,51,52,135,188,12,175,39,156,207,64,185,195,224,112,202,146,60,104,76,211,184,160,140,142,121,208,136,233,52,56,36,121,240,110,206,130,195,44,141,138,176,248,28,28,198,177,135,29,199,118,130,70,200,102,15,215,104,66,10,226,235,212,194,228,79,101,230,61,225,21,189,130,154,204,196,38,105,209,170,165,
-95,91,178,134,17,134,248,132,160,193,156,103,148,222,162,153,178,67,57,24,54,42,165,251,60,128,211,105,152,102,47,67,32,77,55,66,32,98,4,209,177,188,8,99,62,15,179,117,88,219,16,13,102,36,63,39,140,133,55,228,138,211,2,68,73,115,30,212,63,245,7,23,239,159,44,212,117,167,213,154,133,0,186,160,242,94,158,144,7,40,56,25,78,221,155,103,170,30,171,30,193,143,190,64,20,140,206,7,39,189,179,63,70,193,63,35,117,125,49,8,70,221,227,238,47,167,75,242,98,110,134,134,111,222,85,38,64,83,5,6,49,129,6,221,167,124,130,198,98,150,210,174,156,116,123,137,60,214,163,92,193,59,75,242,228,154,85,6,107,2,168,133,251,234,66,109,80,70,20,106,41,76,9,102,7,205,244,143,245,186,174,146,239,210,57,20,81,109,93,44,93,24,104,147,245,198,250,214,224,25,202,231,211,136,20,162,210,41,176,34,201,42,173,23,172,186,234,124,176,172,102,164,224,41,97,186,216,117,134,247,117,123,222,127,50,201,79,6,218,186,0,30,23,195,74,90,
-247,203,218,224,133,236,55,143,91,244,194,36,210,123,46,149,183,13,162,205,22,168,132,94,207,46,148,44,189,37,178,13,203,146,128,62,94,86,133,134,129,194,60,65,233,24,76,80,170,130,151,205,92,249,47,61,86,81,189,164,100,68,121,158,209,44,33,197,250,163,82,216,232,145,167,83,177,116,223,233,129,57,150,46,165,198,163,235,229,92,215,104,249,27,30,125,251,21,243,138,202,87,66,229,37,109,61,46,165,81,191,31,47,177,202,148,47,107,63,31,40,229,165,50,47,214,98,233,36,59,207,171,240,66,190,224,85,64,228,242,134,126,212,232,43,94,16,242,50,74,189,60,162,15,59,176,145,246,175,77,68,6,213,119,94,6,27,158,165,187,225,86,14,255,11,248,38,228,42,236,78,208,175,224,16,209,131,163,8,219,1,253,194,231,213,9,136,200,72,134,222,137,196,9,201,96,195,152,236,202,163,234,246,234,84,116,240,255,192,166,75,115,14,155,180,93,152,148,46,175,206,162,12,252,194,60,20,225,120,39,220,202,225,245,181,151,97,119,19,61,204,72,158,132,187,180,
-210,210,229,245,69,215,129,183,35,191,160,60,29,127,14,106,253,203,139,193,199,222,89,247,184,223,255,249,184,251,107,80,239,95,254,54,232,157,108,219,140,42,119,127,221,93,61,2,7,249,5,185,63,189,19,47,25,234,72,197,83,3,217,236,78,148,5,121,224,235,59,118,105,125,30,178,219,117,162,225,226,228,135,66,113,21,135,89,22,133,112,182,227,20,21,36,38,233,221,242,156,68,68,16,86,57,33,78,96,79,177,112,159,128,63,56,69,98,139,1,7,245,130,36,237,133,229,176,11,199,204,252,6,149,60,144,47,196,237,174,114,1,163,154,98,83,33,162,121,160,88,42,146,198,161,152,75,176,150,186,244,186,199,31,123,131,11,176,175,14,179,3,31,45,166,254,125,66,128,90,174,192,35,26,199,243,66,166,183,36,37,210,170,51,93,193,178,164,5,20,133,38,208,47,228,190,64,238,207,40,236,15,161,36,210,60,206,230,9,140,44,159,86,149,12,52,86,49,131,123,150,149,46,50,76,65,66,6,247,245,19,89,226,171,106,43,230,97,44,141,224,96,202,232,188,136,
-213,110,144,79,52,32,153,164,80,110,225,30,161,168,230,27,77,225,179,129,174,232,116,25,7,220,116,110,82,236,24,157,129,124,75,50,206,201,29,240,63,23,7,210,141,131,131,232,79,18,243,46,192,134,238,249,140,133,238,175,207,88,156,211,4,116,217,98,114,247,236,120,151,206,158,10,112,69,194,34,158,116,233,116,38,112,44,20,93,252,248,64,166,68,30,70,248,36,228,80,242,57,185,71,242,24,174,74,68,230,9,182,224,81,24,101,159,65,170,66,44,129,16,118,218,156,67,42,238,39,226,77,1,52,49,233,191,56,224,104,59,6,181,15,253,39,129,237,42,130,212,126,6,189,209,233,131,126,141,34,222,202,64,235,250,158,33,70,248,124,182,154,235,69,74,151,245,70,243,24,106,0,230,81,184,106,176,141,31,139,128,242,157,129,76,34,204,166,30,101,192,67,128,97,98,211,202,211,41,169,107,75,185,96,21,163,136,148,235,57,217,222,189,174,32,174,208,184,124,220,253,6,87,180,8,126,208,27,252,159,196,73,107,101,203,255,84,31,91,13,36,251,177,138,117,141,
-212,183,255,195,227,141,254,79,101,111,86,76,215,206,82,91,206,7,113,56,19,203,173,218,231,38,244,94,180,182,251,52,79,232,189,232,81,241,132,82,70,74,33,199,5,157,46,31,167,232,24,196,98,18,54,8,171,77,150,10,242,121,145,175,172,53,141,81,211,105,200,100,150,51,165,162,98,210,234,110,182,68,247,40,5,254,191,49,116,103,77,
+120,156,173,88,11,83,227,182,22,254,43,154,161,75,195,78,26,44,63,98,39,105,59,208,0,219,76,129,48,203,182,157,59,25,19,191,20,226,226,88,169,165,0,219,189,187,191,253,30,61,28,59,33,16,114,203,206,14,73,172,115,142,190,239,59,71,71,146,71,38,250,238,59,163,105,236,25,91,254,117,79,200,36,92,100,220,31,165,182,237,245,66,211,233,221,253,54,236,244,132,63,6,127,203,197,150,231,88,216,54,219,240,7,91,216,116,76,203,198,158,217,177,61,203,242,140,110,156,133,140,249,163,204,244,60,233,100,54,205,61,211,117,76,236,218,158,237,97,203,245,76,240,53,13,195,52,92,211,193,182,229,153,78,55,33,44,246,71,6,152,91,48,71,167,109,117,12,108,24,46,198,134,101,186,134,229,216,24,91,38,132,48,93,19,27,78,151,228,137,63,250,181,221,19,14,182,32,229,180,1,122,27,162,217,182,1,209,133,155,109,97,203,48,45,7,119,156,118,55,34,183,105,190,137,146,179,149,146,107,116,83,78,102,154,81,104,247,222,31,57,61,12,174,237,102,123,
+207,133,105,109,7,38,235,8,70,22,184,153,102,219,233,96,199,6,72,182,97,118,11,242,247,34,45,200,140,228,92,71,72,49,54,113,47,194,110,15,32,124,251,246,173,133,109,67,41,229,2,22,108,0,110,19,195,51,224,225,98,167,99,116,28,15,123,134,229,218,166,227,2,245,121,88,132,51,205,36,178,205,158,230,225,53,189,189,54,110,131,162,134,7,248,157,14,4,48,128,4,124,130,144,14,252,183,188,46,215,206,194,79,56,117,154,157,61,16,201,114,12,183,99,184,182,235,216,192,196,196,109,12,66,26,130,63,164,161,155,211,98,22,102,254,232,203,248,43,26,161,47,95,176,168,146,163,6,36,164,101,155,45,227,0,141,152,209,235,158,100,65,55,80,185,239,190,123,135,70,239,143,220,158,141,46,142,175,6,167,143,190,255,245,235,190,63,98,86,15,137,15,220,235,170,231,149,7,26,29,53,140,150,209,2,224,7,22,210,21,100,161,177,63,122,111,149,65,132,107,167,7,177,213,111,20,133,140,40,211,150,10,110,202,232,134,156,164,196,121,214,192,166,119,240,65,
+254,61,194,18,170,68,135,250,52,103,188,88,196,156,22,40,33,60,76,179,18,165,173,80,58,117,148,250,91,35,56,232,10,103,141,168,113,32,12,77,17,81,47,26,20,87,97,91,21,229,173,104,174,22,81,150,198,232,130,240,41,77,208,121,202,248,75,104,206,41,20,115,208,144,115,161,107,94,164,249,109,208,60,249,115,248,241,36,104,70,148,102,18,101,37,40,18,207,252,49,76,35,29,253,70,125,76,6,129,193,241,141,10,116,163,3,10,251,35,11,177,127,174,10,58,73,51,114,25,206,136,63,14,126,26,95,254,126,126,222,68,114,54,101,146,60,156,101,225,45,147,131,35,248,109,248,205,141,179,195,80,52,200,83,126,204,174,73,113,159,198,68,123,84,150,147,48,99,196,175,68,21,140,81,38,48,163,201,34,143,121,74,243,214,114,240,19,69,241,52,204,111,9,164,79,105,47,139,155,112,82,48,24,33,241,29,74,57,67,11,40,146,209,205,148,243,57,40,119,24,28,206,88,146,7,173,89,26,23,148,209,9,15,90,49,157,5,135,36,15,126,88,176,224,48,75,
+163,34,44,62,7,135,113,236,97,199,177,157,160,21,178,249,227,13,154,146,130,248,58,163,48,249,115,153,249,64,120,77,47,93,47,155,164,69,171,150,245,82,130,17,134,248,148,160,225,130,103,148,222,161,185,178,67,57,24,214,138,106,11,128,211,25,212,244,235,16,72,211,141,16,136,24,65,116,34,127,132,49,95,132,217,58,172,109,136,134,115,146,95,16,198,194,91,114,13,171,2,68,73,115,30,52,127,63,31,94,126,120,182,80,215,157,86,107,22,2,232,130,202,7,121,66,30,161,224,100,56,245,108,145,169,122,172,123,4,63,249,2,81,48,190,24,158,12,206,254,51,14,254,59,86,191,47,135,193,184,127,220,255,245,180,34,47,230,102,104,244,238,135,218,4,104,166,192,32,38,208,160,135,148,79,209,68,204,82,218,149,147,110,47,145,167,122,148,43,120,103,73,158,93,179,202,96,77,0,181,112,223,92,168,13,202,136,66,45,133,41,193,252,43,205,160,30,235,212,251,116,1,37,212,88,151,74,151,5,218,100,189,177,186,53,116,134,242,197,44,34,133,168,115,10,156,
+72,178,74,234,21,107,174,62,31,44,170,57,41,120,74,152,46,117,157,223,125,221,156,247,159,77,241,179,129,182,150,255,211,82,88,73,234,126,89,25,188,144,221,230,105,131,94,154,68,122,39,83,89,219,32,218,124,137,74,232,245,226,50,201,210,59,34,155,176,44,8,232,226,101,77,104,24,40,204,19,148,78,192,4,165,42,120,217,202,149,127,229,177,138,106,189,96,244,151,39,203,236,140,102,9,41,214,54,74,72,131,176,210,99,207,39,163,10,240,186,13,83,168,44,21,156,72,167,82,231,241,77,53,219,13,170,190,195,230,183,95,51,175,41,125,45,148,174,168,235,113,41,143,250,254,116,145,213,166,124,93,3,250,72,41,47,213,121,181,26,149,147,236,61,111,194,11,249,130,87,1,145,203,7,122,179,209,191,120,65,200,235,40,13,242,136,62,238,192,70,218,191,53,17,25,84,63,121,29,108,216,77,119,195,173,28,254,21,240,77,200,85,216,157,160,95,195,157,102,0,55,35,182,3,250,165,207,155,19,16,145,145,12,189,19,137,19,146,193,145,49,217,149,71,221,237,
+205,169,232,224,255,7,27,184,213,112,56,166,237,194,164,116,121,115,22,101,224,87,230,161,8,39,59,225,86,14,111,175,189,12,187,155,232,97,70,242,36,220,165,149,150,46,111,47,186,14,188,29,249,37,229,233,228,115,208,56,191,186,28,126,26,156,245,143,207,207,127,57,238,255,22,52,207,175,254,24,14,78,182,29,71,149,187,191,238,174,14,17,195,252,146,60,156,222,139,119,30,77,164,226,169,129,108,126,47,202,130,60,242,245,51,187,180,190,8,217,221,58,209,112,121,247,67,161,248,21,135,89,22,133,112,187,227,20,21,36,38,233,125,117,83,34,34,8,171,221,17,167,112,174,88,186,79,193,31,156,34,113,204,136,179,176,32,73,119,105,57,234,195,69,19,54,241,146,7,242,133,184,253,85,46,96,212,80,108,106,68,52,15,20,75,69,210,56,20,115,9,214,82,151,65,255,248,211,96,120,9,246,245,97,118,224,163,229,212,127,78,9,80,203,21,120,68,227,120,81,200,244,150,164,68,90,117,166,107,88,42,90,64,81,104,2,253,66,158,11,228,25,141,194,25,17,
+74,34,205,227,108,145,192,72,181,91,213,50,208,90,197,12,238,89,86,186,200,48,5,9,25,60,215,59,178,196,87,215,86,204,195,88,26,193,213,148,209,69,17,171,19,33,159,106,64,50,73,161,60,198,61,65,81,207,55,154,193,223,22,186,166,179,42,14,184,233,220,164,216,49,122,67,249,158,100,146,147,123,224,127,33,174,164,27,7,135,209,95,36,230,125,128,13,221,243,5,11,221,95,95,176,184,160,9,232,178,197,228,254,197,241,62,157,63,23,224,154,132,69,60,237,211,217,92,224,88,42,186,252,242,145,204,136,188,144,240,105,200,161,228,115,242,128,228,69,92,149,136,204,19,28,195,163,48,202,62,131,84,133,88,2,33,156,182,57,135,84,60,76,197,187,2,104,98,210,127,121,201,209,118,12,106,31,250,79,34,14,172,144,218,207,160,55,58,125,212,47,82,196,123,25,104,93,223,51,196,8,95,204,87,115,189,76,105,85,111,52,143,161,6,96,30,133,171,1,71,249,137,8,40,223,26,200,36,194,108,106,43,3,30,2,12,19,135,86,158,206,72,83,91,202,5,
+171,24,69,164,92,207,201,246,238,117,13,113,133,198,229,118,247,7,17,175,220,130,31,245,33,255,103,113,204,95,57,246,63,215,199,86,3,201,126,172,98,221,32,245,233,255,248,244,114,245,115,217,155,21,211,181,251,212,150,87,106,113,56,23,203,173,222,231,166,244,65,180,182,135,52,79,232,131,232,81,241,148,82,70,74,33,39,5,157,85,219,41,58,6,177,152,132,13,194,106,147,74,65,190,40,242,149,181,166,49,106,58,45,153,204,114,166,84,84,76,90,63,205,150,232,158,164,192,255,31,6,241,146,4,
 
diff --git a/bazaar/MAPIEx/src.tpp/MAPIFolder$en-us.tpp b/bazaar/MAPIEx/src.tpp/MAPIFolder$en-us.tpp
index 53c4ac998..6da3b9b46 100644
--- a/bazaar/MAPIEx/src.tpp/MAPIFolder$en-us.tpp
+++ b/bazaar/MAPIEx/src.tpp/MAPIFolder$en-us.tpp
@@ -22,28 +22,26 @@ ublic][3 _][*@3;3 MAPIObject]&]
 [s5;:MAPIFolder`:`:MAPIFolder`(`): [* MAPIFolder]()&]
 [s2;%% Default constructor&]
 [s3; &]
-[s3;2 &]
-[s0; &]
 [ {{10000F(128)G(128)@1 [s0;%% [* Public Method List]]}}&]
 [s4; &]
 [s5;:MAPIFolder`:`:GetName`(`): [_^String^ String]_[* GetName]()&]
 [s2;%% Gets folder name.&]
 [s3; &]
 [s4; &]
-[s5;:MAPIFolder`:`:OpenSubFolder`(const String`,MAPIFolder`&`): [@(0.0.255) bool]_[* Open
-SubFolder]([@(0.0.255) const]_[_^String^ String]_[*@3 subFolderName], 
+[s5;:MAPIFolder`:`:OpenSubFolder`(const String`&`,MAPIFolder`&`): [@(0.0.255) bool]_[* Op
+enSubFolder]([@(0.0.255) const]_[_^String^ String `&][*@3 subFolderName], 
 [_^MAPIFolder^ MAPIFolder]_`&[*@3 subFolder])&]
 [s2;%% Opens [%-*@3 subFolderName] under [%-*@3 subFolder].&]
 [s3;%% &]
 [s4; &]
-[s5;:MAPIFolder`:`:CreateSubFolder`(const String`,MAPIFolder`&`): [@(0.0.255) bool]_[* Cr
-eateSubFolder]([@(0.0.255) const]_[_^String^ String]_[*@3 subFolderName], 
+[s5;:MAPIFolder`:`:CreateSubFolder`(const String`&`,MAPIFolder`&`): [@(0.0.255) bool]_[* C
+reateSubFolder]([@(0.0.255) const]_[_^String^ String]_`&[*@3 subFolderName], 
 [_^MAPIFolder^ MAPIFolder]_`&[*@3 subFolder])&]
 [s2;%% Creates a folder named [%-*@3 subFolderName] under [%-*@3 subFolder].&]
 [s3;%% &]
 [s4; &]
-[s5;:MAPIFolder`:`:DeleteSubFolder`(const String`): [@(0.0.255) bool]_[* DeleteSubFolder](
-[@(0.0.255) const]_[_^String^ String]_[*@3 subFolder])&]
+[s5;:MAPIFolder`:`:DeleteSubFolder`(const String`&`): [@(0.0.255) bool]_[* DeleteSubFolde
+r]([@(0.0.255) const]_[_^String^ String]_`&[*@3 subFolder])&]
 [s2;%% Deletes a subfolder named [%-*@3 subFolder].&]
 [s3;%% &]
 [s4; &]
diff --git a/bazaar/MAPIEx/src.tpp/MAPIFolder$en-us.tppi b/bazaar/MAPIEx/src.tpp/MAPIFolder$en-us.tppi
index 97ad60ecf..d6d0f13a8 100644
--- a/bazaar/MAPIEx/src.tpp/MAPIFolder$en-us.tppi
+++ b/bazaar/MAPIEx/src.tpp/MAPIFolder$en-us.tppi
@@ -1,9 +1,9 @@
 TITLE("class MAPIFolder : public MAPIObject")
 COMPRESSED
-120,156,197,88,11,111,219,54,16,254,43,4,210,6,78,225,25,124,201,122,97,128,179,188,26,44,137,131,56,29,48,24,170,37,219,76,170,85,150,60,61,182,21,69,243,219,119,148,40,139,241,35,118,146,22,13,130,8,228,221,119,188,239,227,145,71,100,72,209,155,55,184,141,247,240,150,31,231,88,220,5,69,148,123,195,144,115,203,13,168,225,126,254,189,111,187,18,79,0,207,76,194,44,131,17,78,187,240,135,48,66,13,202,56,177,168,205,45,198,44,236,76,162,32,203,188,97,68,45,171,4,209,54,221,163,166,65,137,201,45,110,17,102,90,20,176,20,99,138,77,106,16,206,44,106,56,83,145,77,188,33,6,119,6,107,216,93,102,99,130,177,73,8,102,212,196,204,224,132,48,10,33,168,73,9,54,28,17,79,189,225,251,174,43,1,92,146,50,186,144,122,23,162,113,142,33,186,132,113,70,24,166,204,32,182,209,117,198,226,62,140,215,81,50,182,82,50,177,19,230,98,166,24,5,220,125,215,51,92,2,208,110,187,187,103,194,178,220,128,197,108,201,136,1,140,210,
-174,97,19,131,67,74,28,83,39,21,127,23,97,42,102,34,206,85,132,144,16,74,220,49,49,93,72,225,225,225,161,67,56,174,148,50,33,23,130,33,111,74,96,14,120,152,196,176,177,109,88,196,194,204,228,212,48,129,250,60,72,131,153,98,50,230,212,85,60,172,182,181,215,37,93,80,20,91,144,191,97,67,0,12,36,224,11,66,26,240,203,44,39,87,96,137,147,32,187,109,239,129,72,204,192,166,141,77,110,26,28,152,80,210,37,32,36,150,252,97,27,156,56,73,103,65,228,13,191,142,190,161,33,250,250,149,200,42,233,181,96,67,58,156,118,240,1,26,102,216,125,251,22,13,223,245,76,151,163,203,195,235,243,211,36,154,138,212,243,190,125,219,247,164,181,76,182,148,188,215,194,29,220,129,252,14,48,210,108,139,45,113,26,184,239,248,85,45,57,104,216,192,24,82,245,197,208,200,27,190,99,250,122,114,206,129,89,221,123,94,140,163,112,82,187,247,152,91,33,250,227,191,196,36,247,100,10,182,139,250,69,30,37,201,103,116,87,198,233,200,89,6,2,85,9,202,
-79,77,251,180,69,168,117,112,86,254,237,145,134,57,58,74,226,44,79,139,73,158,164,104,42,242,32,140,106,246,188,12,144,25,203,212,180,81,203,63,112,100,16,141,74,235,64,130,168,140,174,206,35,154,52,75,84,9,162,23,228,121,93,202,129,46,69,254,41,153,162,139,48,203,183,229,121,38,242,171,96,38,84,146,163,143,131,60,13,227,251,143,168,250,122,35,8,170,92,244,164,97,42,83,114,162,24,108,29,45,229,77,43,245,231,34,30,20,227,90,148,146,175,90,198,111,107,174,251,101,38,205,38,163,113,146,68,101,34,143,34,120,45,221,167,140,6,78,235,8,244,24,202,106,84,73,164,45,137,54,43,126,212,119,102,228,239,63,70,120,13,107,185,126,134,134,111,127,89,13,137,138,88,106,177,108,243,148,48,0,126,74,154,163,84,4,185,120,157,56,75,49,126,130,60,85,6,25,10,244,202,152,254,8,189,142,69,36,54,235,181,73,161,37,212,203,20,242,244,147,43,227,73,190,96,125,146,242,75,105,237,180,241,171,180,182,238,222,221,38,42,42,113,101,239,44,
-120,237,150,63,220,10,71,73,17,231,234,50,209,146,13,227,188,190,74,74,143,149,187,36,255,36,80,92,204,198,32,97,114,135,100,67,206,0,180,40,165,93,238,151,65,146,66,240,56,135,86,156,249,173,15,23,253,171,51,191,93,125,54,73,167,67,188,10,82,109,119,17,73,211,117,217,78,71,254,175,163,219,195,223,46,78,252,209,160,127,115,235,143,14,7,71,39,87,199,109,180,226,127,26,138,104,90,250,95,223,248,163,203,147,193,224,240,12,80,199,39,23,231,127,156,220,252,233,143,110,207,47,79,26,226,18,178,184,69,43,202,48,136,146,127,161,236,234,157,208,19,65,147,20,188,210,48,64,65,60,69,69,182,226,86,173,15,165,28,21,179,120,183,45,27,136,252,67,12,231,118,218,143,163,47,126,75,42,179,89,45,221,247,241,233,169,125,32,149,177,230,35,165,208,221,160,191,9,173,234,206,239,234,252,53,16,242,194,172,116,68,137,28,21,165,65,201,19,164,162,60,168,33,100,47,166,59,23,229,149,248,47,191,20,89,22,220,139,234,76,213,131,205,135,234,49,
-106,113,166,212,184,58,84,181,81,15,224,239,43,25,102,202,216,176,189,17,121,145,198,101,89,43,214,181,79,85,253,176,92,61,211,209,37,2,35,208,150,212,227,4,205,18,248,42,47,8,149,163,84,69,189,11,162,76,60,75,17,89,248,193,36,175,20,169,7,91,21,81,142,11,69,212,184,82,164,54,174,85,100,162,140,79,41,82,251,52,138,168,153,45,138,40,175,87,42,114,56,159,39,112,83,201,199,124,165,138,62,177,85,25,205,121,161,142,54,87,41,164,59,173,85,41,208,28,158,82,74,243,67,222,66,45,109,118,139,98,154,231,43,85,219,212,175,218,170,29,111,21,110,167,214,181,86,44,213,167,218,107,30,174,107,253,225,129,189,210,197,87,165,85,81,155,26,108,218,187,188,120,27,199,69,56,184,179,64,197,197,67,120,179,234,16,73,133,127,169,232,85,167,126,230,109,246,8,244,93,46,179,250,193,32,53,82,214,229,91,109,199,167,111,50,255,178,129,205,142,239,222,38,192,43,152,61,245,230,93,11,156,87,198,99,145,233,231,20,146,9,159,86,5,229,73,
-221,242,149,69,143,180,155,102,151,201,63,155,42,96,55,205,180,0,63,95,51,153,204,15,151,172,170,215,103,182,188,71,160,239,210,241,244,99,163,172,203,173,239,57,124,94,216,176,86,192,223,189,95,233,60,245,78,181,218,188,150,248,150,255,200,240,254,7,43,122,107,101,
+120,156,197,88,11,79,227,70,16,254,43,43,113,135,2,74,163,125,57,126,169,18,20,56,138,10,4,17,174,82,21,153,216,73,150,59,247,28,59,245,163,237,233,4,191,189,179,246,58,94,242,6,238,84,132,176,118,103,190,217,249,190,157,221,89,49,160,232,221,59,220,198,123,120,203,143,115,42,30,130,34,202,189,65,200,185,229,6,212,112,191,252,214,179,93,137,39,128,103,38,97,150,193,8,167,93,248,67,24,161,6,101,156,88,212,230,22,99,22,118,198,81,144,101,222,32,162,150,85,130,104,155,238,81,211,160,196,228,22,183,8,51,45,10,88,138,49,197,38,53,8,103,22,53,156,137,200,198,222,0,131,59,131,53,236,46,179,49,193,216,36,4,51,106,98,102,112,66,24,133,16,212,164,4,27,142,136,39,222,224,215,174,43,1,92,146,50,186,144,122,23,162,113,142,33,186,132,113,70,24,166,204,32,182,209,117,70,226,83,24,175,162,100,108,165,100,98,39,204,197,84,49,10,184,123,120,100,184,4,160,221,118,119,207,132,101,185,1,139,217,146,17,3,24,165,93,
+195,38,6,135,148,56,166,78,42,254,42,194,84,76,69,156,171,8,33,33,148,184,35,98,186,144,194,211,211,83,135,112,92,41,101,66,46,4,67,222,148,192,28,240,48,137,97,99,219,176,136,133,153,201,169,97,2,245,89,144,6,83,197,100,196,169,171,120,88,109,107,175,75,186,160,40,182,32,127,195,134,0,24,72,192,23,132,52,224,151,89,78,174,192,18,39,65,118,219,222,3,145,152,129,77,27,155,220,52,56,48,161,164,75,64,72,44,249,195,54,56,113,146,78,131,200,27,124,27,62,162,1,250,246,141,200,42,57,106,193,134,116,56,237,224,3,52,200,176,251,254,61,26,28,30,153,46,71,87,199,55,23,31,146,104,34,82,207,123,124,220,247,164,181,76,182,148,252,168,133,59,184,3,249,29,96,164,217,230,91,226,52,112,223,241,171,90,114,208,160,129,49,164,234,139,161,161,55,56,100,250,122,114,206,129,89,221,123,86,140,162,112,92,187,31,49,183,66,244,70,127,138,113,238,201,20,108,23,245,138,60,74,146,47,232,161,140,211,145,179,12,4,170,18,148,159,
+154,246,135,22,161,214,193,121,249,247,136,52,204,209,73,18,103,121,90,140,243,36,69,19,145,7,97,84,179,231,101,128,204,88,164,166,141,90,254,129,35,131,104,84,90,7,18,68,101,116,117,30,209,184,89,162,74,112,167,196,110,74,254,232,74,228,159,147,9,186,12,179,124,91,98,231,34,191,14,166,66,101,53,188,239,231,105,24,127,186,71,213,215,27,66,80,229,162,103,9,83,153,210,15,197,96,235,52,57,174,93,169,55,19,113,191,24,213,42,148,4,213,50,254,190,223,214,156,247,203,92,154,125,69,163,36,137,202,84,158,197,240,90,186,79,25,15,156,22,41,32,127,191,44,5,148,213,184,146,76,91,146,109,214,188,215,183,99,232,239,63,71,120,13,115,153,65,134,6,239,127,90,14,137,138,88,234,177,104,243,148,56,0,222,36,207,73,42,130,92,188,85,160,133,40,187,73,180,76,248,77,18,85,57,100,40,208,43,100,242,35,52,59,21,145,216,164,217,58,149,22,112,175,85,201,211,143,173,140,40,57,131,117,35,237,215,82,219,105,251,151,137,109,221,193,135,
+117,84,84,226,202,222,153,243,218,45,127,184,33,78,146,34,206,213,197,162,37,27,198,121,125,173,148,30,75,247,74,254,89,160,184,152,142,64,194,228,1,201,110,156,1,104,94,78,187,220,53,253,36,133,224,113,14,125,56,243,91,31,47,123,215,231,126,187,250,172,147,78,135,120,21,100,88,10,84,68,210,116,83,246,210,161,255,243,240,238,248,151,203,51,127,216,239,221,222,249,195,227,254,201,217,245,105,27,45,249,127,8,69,52,41,253,111,110,253,225,213,89,191,127,124,14,168,211,179,203,139,223,207,110,255,240,135,119,23,87,103,13,113,9,153,223,168,21,101,24,68,201,63,242,6,83,59,161,39,130,198,41,120,165,97,128,130,120,130,138,108,201,173,90,31,138,57,42,166,241,110,91,214,23,249,199,24,206,238,164,23,71,95,253,150,84,102,189,90,186,239,243,243,83,251,64,42,35,205,71,74,161,187,65,115,19,90,213,93,60,212,249,107,32,228,133,89,233,136,18,57,42,74,131,146,39,72,69,121,84,67,200,94,76,118,46,202,107,241,111,126,37,178,44,248,36,
+170,51,85,15,214,31,170,231,168,249,153,82,227,234,80,213,70,61,0,52,158,74,134,169,50,54,108,111,69,94,164,113,89,214,138,117,237,83,85,63,44,87,207,116,116,137,192,8,180,37,245,56,65,211,4,190,202,11,66,229,40,85,81,31,130,40,19,47,82,68,22,126,48,206,43,69,234,193,86,69,148,227,92,17,53,174,20,169,141,43,21,25,43,227,38,69,106,159,70,17,53,179,69,17,229,245,70,69,142,103,179,4,110,42,249,146,175,84,209,39,182,42,163,57,207,213,209,230,42,133,116,167,149,42,5,154,195,38,165,52,63,228,205,213,210,102,183,40,166,121,190,81,181,117,253,170,189,181,37,47,6,216,212,186,86,138,165,250,84,123,197,35,118,165,63,188,174,151,186,248,178,180,42,106,83,131,77,123,151,23,111,227,56,15,7,119,22,168,56,127,20,175,87,29,34,169,240,175,21,189,234,212,47,188,205,158,129,190,203,101,86,63,24,164,70,202,186,120,171,237,248,4,78,102,95,215,176,217,241,245,219,4,120,3,179,77,239,222,149,192,89,101,60,21,153,126,
+78,33,153,112,179,42,40,79,234,150,175,44,122,164,221,52,187,74,254,94,87,1,187,105,166,5,248,255,53,147,201,252,112,201,170,122,125,97,203,123,6,250,46,29,79,63,54,202,186,216,250,94,194,231,149,13,107,9,252,221,251,149,206,83,239,84,203,205,107,129,111,249,79,13,239,63,138,29,106,93,
 
diff --git a/bazaar/MAPIEx/src.tpp/MAPIMessage$en-us.tpp b/bazaar/MAPIEx/src.tpp/MAPIMessage$en-us.tpp
index fc3e89720..ae1c928e9 100644
--- a/bazaar/MAPIEx/src.tpp/MAPIMessage$en-us.tpp
+++ b/bazaar/MAPIEx/src.tpp/MAPIMessage$en-us.tpp
@@ -1,4 +1,4 @@
-topic "class MAPIFolder : public MAPIObject";
+topic "class MAPIMessage : public MAPIObject";
 [2 $$0,0#00000000000000000000000000000000:Default]
 [i448;a25;kKO9;2 $$1,0#37138531426314131252341829483380:class]
 [l288;2 $$2,2#27521748481378242620020725143825:desc]
@@ -12,12 +12,182 @@ topic "class MAPIFolder : public MAPIObject";
 [{_} 
 [ {{10000@(113.42.0) [s0;%% [*@7;4 MAPIMessage]]}}&]
 [s0;i448;kKO9;@(0.0.255)0 &]
-[s0;i448;a25;kKO9;:MAPIFolder`:`:class: [@(0.0.255)3 class][3 _][*3 MAPIMessage][3 _:_][@(0.0.255)3 p
+[s0;i448;a25;kKO9;:MAPIMessage`:`:class: [@(0.0.255)3 class][3 _][*3 MAPIMessage][3 _:_][@(0.0.255)3 p
 ublic][3 _][*@3;3 MAPIObject]&]
 [s9; Outlook email message.&]
 [s3;2 &]
-[s3;2 &]
-[ {{10000F(128)G(128)@1 [s0;%% [* Public Method List]]}}&]
 [s0; &]
-[s0;3 &]
-[s0;%% ]
\ No newline at end of file
+[ {{10000F(128)G(128)@1 [s0;%% [* Constructor detail]]}}&]
+[s4; &]
+[s5;:MAPIMessage`:`:MAPIMessage`(`): [* MAPIMessage]()&]
+[s2;%% Default constructor.&]
+[s3; &]
+[ {{10000F(128)G(128)@1 [s0;%% [* Public Method List]]}}&]
+[s4; &]
+[s5;:MAPIMessage`:`:IsUnread`(`): [@(0.0.255) bool]_[* IsUnread]()&]
+[s2;%% Returns true if message is unread.&]
+[s3; &]
+[s4; &]
+[s5;:MAPIMessage`:`:MarkAsRead`(bool`): [@(0.0.255) bool]_[* MarkAsRead]([@(0.0.255) bool]_
+[*@3 bRead]_`=_[@(0.0.255) true])&]
+[s2;%% Marks message ar read or unread depending the value of [%-*@3 bRead].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIMessage`:`:Create`(MAPIEx`&`,MAPIFolder`&`,int`,bool`): [@(0.0.255) bool]_[* Cre
+ate]([_^MAPIEx^ MAPIEx]_`&[*@3 mapi], [_^MAPIFolder^ MAPIFolder]_`&[*@3 folder], 
+[@(0.0.255) int]_[*@3 nPriority]_`=_IMPORTANCE`_NORMAL, [@(0.0.255) bool]_[*@3 bSaveToSen
+tFolder]_`=_[@(0.0.255) true])&]
+[s2;%% Creates the message using MAPIEx [%-*@3 mapi], in folder [%-*@3 folder], 
+with priority [%-*@3 nPriority] , and labeled as `"delete after 
+submit`" if [%-*@3 bSaveToSentFolder ]is false.&]
+[s2;%% Valid priorities in [%-*@3 nPriority] are IMPORTANCE`_NORMAL, 
+IMPORTANCE`_HIGH or IMPORTANCE`_LOW.&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIMessage`:`:ShowForm`(MAPIEx`*`,MAPIFolder`&`): [@(0.0.255) int]_[* ShowForm]([_^MAPIEx^ M
+APIEx][@(0.0.255) `*]_[*@3 pMAPI], [_^MAPIFolder^ MAPIFolder]_`&[*@3 folder])&]
+[s2;%% Opens the email window form using MAPIEx [%-*@3 pMAPI], in folder 
+[%-*@3 folder].&]
+[s2;%% Returns false on failure, IDOK on success or close existing 
+messages and IDCANCEL on close new messages.&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIMessage`:`:Send`(`): [@(0.0.255) bool]_[* Send]()&]
+[s2;%% Sends the email.&]
+[s3; &]
+[s4; &]
+[s5;:MAPIMessage`:`:GetHeader`(`): [@(0.0.255) String]_[* GetHeader]()&]
+[s2;%% Returns the message header.&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIMessage`:`:GetSenderName`(`): [_^String^ String]_[* GetSenderName]()&]
+[s2;%% Returns the sender name.&]
+[s3; &]
+[s4; &]
+[s5;:MAPIMessage`:`:GetSenderEmail`(`): [_^String^ String]_[* GetSenderEmail]()&]
+[s2;%% Returns the sender email.&]
+[s3; &]
+[s4; &]
+[s5;:MAPIMessage`:`:GetSubject`(`): [_^String^ String]_[* GetSubject]()&]
+[s2;%% Returns the message subject.&]
+[s3; &]
+[s4;%% &]
+[s5;:MAPIMessage`:`:GetSubmitTime`(`): [_^Time^ Time]_[* GetSubmitTime]()&]
+[s2;%% Returns the message submit time.&]
+[s3; &]
+[s4; &]
+[s5;:MAPIMessage`:`:GetReceivedTime`(`): [_^Time^ Time]_[* GetReceivedTime]()&]
+[s2;%% Returns the message received time.&]
+[s3; &]
+[s4; &]
+[s5;:MAPIMessage`:`:GetLastModificationTime`(`): [_^Time^ Time]_[* GetLastModificationTim
+e]()&]
+[s2;%% Returns the message last modification time.&]
+[s3; &]
+[s4; &]
+[s5;:MAPIMessage`:`:GetCreationTime`(`): [_^Time^ Time]_[* GetCreationTime]()&]
+[s2;%% Returns the message creation time.&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIMessage`:`:GetTo`(`): [_^String^ String]_[* GetTo]()&]
+[s2;%% Returns the `"to`" email addresses.&]
+[s3; &]
+[s4; &]
+[s5;:MAPIMessage`:`:GetCC`(`): [_^String^ String]_[* GetCC]()&]
+[s2;%% Returns the `"cc`" email addresses.&]
+[s3; &]
+[s4; &]
+[s5;:MAPIMessage`:`:GetBCC`(`): [_^String^ String]_[* GetBCC]()&]
+[s2;%% Returns the `"bcc`" email addresses.&]
+[s3; &]
+[s4; &]
+[s5;:MAPIMessage`:`:GetSensitivity`(`): [@(0.0.255) int]_[* GetSensitivity]()&]
+[s2;%% Returns the message sensitivity.&]
+[s3; &]
+[s4; &]
+[s5;:MAPIMessage`:`:GetMessageStatus`(`): [@(0.0.255) int]_[* GetMessageStatus]()&]
+[s2;%% Returns the message status.&]
+[s3; &]
+[s4; &]
+[s5;:MAPIMessage`:`:GetPriority`(`): [@(0.0.255) int]_[* GetPriority]()&]
+[s2;%% Returns the message priority.&]
+[s3; &]
+[s4; &]
+[s5;:MAPIMessage`:`:GetSize`(`): DWORD_[* GetSize]()&]
+[s2;%% Returns the message size.&]
+[s3; &]
+[s4; &]
+[s5;:MAPIMessage`:`:GetRecipients`(`): [@(0.0.255) bool]_[* GetRecipients]()&]
+[s2;%% Gathers message recipients. To be called before GetNextRecipient().&]
+[s3; &]
+[s4; &]
+[s5;:MAPIMessage`:`:GetNextRecipient`(String`&`,String`&`,int`&`): [@(0.0.255) bool]_[* G
+etNextRecipient]([_^String^ String][@(0.0.255) `&]_[*@3 strName], [_^String^ String][@(0.0.255) `&
+]_[*@3 strEmail], [@(0.0.255) int`&]_[*@3 nType])&]
+[s2;%% Gets next recipient data like name in [%-*@3 strName], email 
+in [%-*@3 strEmail] and type in [%-*@3 nType].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIMessage`:`:GetReplyTo`(`): [_^String^ String]_[* GetReplyTo]()&]
+[s2;%% &]
+[s3; &]
+[s4; &]
+[s5;:MAPIMessage`:`:AddRecipients`(LPADRLIST`): [@(0.0.255) bool]_[* AddRecipients](LPADR
+LIST_[*@3 pAddressList])&]
+[s2;%%  [%-*@3 pAddressList].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIMessage`:`:AddRecipient`(const String`&`,int`,const char`*`): [@(0.0.255) bool
+]_[* AddRecipient]([@(0.0.255) const]_[_^String^ String]_`&[*@3 email], 
+[@(0.0.255) int]_[*@3 nType][@(0.0.255) `=]MAPI`_TO, [@(0.0.255) const]_[@(0.0.255) char`*]_
+[*@3 szAddrType][@(0.0.255) `=]NULL)&]
+[s2;%%  [%-*@3 email] [%-*@3 nType] [%-*@3 szAddrType].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIMessage`:`:SetSubject`(const String`&`): [@(0.0.255) void]_[* SetSubject]([@(0.0.255) c
+onst]_[_^String^ String]_`&[*@3 subject])&]
+[s2;%% Sets message subject in [%-*@3 subject].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIMessage`:`:SetSender`(const String`&`,const String`&`): [@(0.0.255) void]_[* Set
+Sender]([@(0.0.255) const]_[_^String^ String]_`&[*@3 senderName], [@(0.0.255) const]_[_^String^ S
+tring]_`&[*@3 senderEmail])&]
+[s2;%%  [%-*@3 senderName] [%-*@3 senderEmail].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIMessage`:`:SetReceivedTime`(const Time`&`): [@(0.0.255) bool]_[* SetReceivedTime
+]([@(0.0.255) const]_[_^Time^ Time]_`&[*@3 tm])&]
+[s2;%% Sets message received time in [%-*@3 tm].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIMessage`:`:SetSubmitTime`(const Time`&`): [@(0.0.255) bool]_[* SetSubmitTime]([@(0.0.255) c
+onst]_[_^Time^ Time]_`&[*@3 tm])&]
+[s2;%% Sets message submit time in [%-*@3 tm].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIMessage`:`:SetReadReceipt`(bool`,String`): [@(0.0.255) bool]_[* SetReadReceipt](
+[@(0.0.255) bool]_[*@3 bSet]_`=_[@(0.0.255) true], [_^String^ String]_[*@3 szReceiverEmail]_
+`=_Null)&]
+[s2;%%  [%-*@3 bSet] [%-*@3 szReceiverEmail].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIMessage`:`:SetDeliveryReceipt`(bool`): [@(0.0.255) bool]_[* SetDeliveryReceipt](
+[@(0.0.255) bool]_[*@3 bSet]_`=_[@(0.0.255) true])&]
+[s2;%% Sets delivery receipt in [%-*@3 bSet].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIMessage`:`:MarkAsPrivate`(`): [@(0.0.255) bool]_[* MarkAsPrivate]()&]
+[s2;%% Mark message as private.&]
+[s3; &]
+[s4; &]
+[s5;:MAPIMessage`:`:SetMessageStatus`(int`): [@(0.0.255) bool]_[* SetMessageStatus]([@(0.0.255) i
+nt]_[*@3 nMessageStatus])&]
+[s2;%% Sets message status in [%-*@3 nMessageStatus].&]
+[s3;%% &]
+[s4; &]
+[s5;:MAPIMessage`:`:SaveToFile`(const String`&`): [@(0.0.255) bool]_[* SaveToFile]([@(0.0.255) c
+onst]_[_^String^ String]_`&[*@3 fileName])&]
+[s2;%% Saves message to .msg file in [%-*@3 fileName]. Returns true 
+if there is no problem.&]
+[s3; &]
+[s3; ]
\ No newline at end of file
diff --git a/bazaar/MAPIEx/src.tpp/MAPIMessage$en-us.tppi b/bazaar/MAPIEx/src.tpp/MAPIMessage$en-us.tppi
index 4262a26a9..3a3b7d06b 100644
--- a/bazaar/MAPIEx/src.tpp/MAPIMessage$en-us.tppi
+++ b/bazaar/MAPIEx/src.tpp/MAPIMessage$en-us.tppi
@@ -1,6 +1,11 @@
-TITLE("class MAPIFolder : public MAPIObject")
+TITLE("class MAPIMessage : public MAPIObject")
 COMPRESSED
-120,156,133,146,93,107,219,48,20,134,255,138,32,237,72,75,8,231,67,178,190,110,50,24,221,198,22,218,123,99,90,39,209,58,175,78,210,197,206,85,73,127,251,142,18,119,237,96,80,99,36,144,244,156,243,190,175,84,146,58,59,131,9,140,224,157,47,124,74,63,234,125,219,87,101,163,181,139,53,153,248,240,237,218,199,204,163,240,108,145,157,97,212,84,200,128,140,100,136,53,58,242,218,49,59,8,203,182,238,186,170,108,201,185,35,68,19,26,145,53,132,86,59,237,144,173,35,97,9,128,192,146,65,205,142,76,88,165,110,89,149,32,199,89,122,248,130,61,32,128,69,4,38,11,108,52,34,147,148,32,75,8,38,164,205,170,42,191,20,49,3,58,155,50,133,72,47,164,154,214,32,213,51,166,25,25,136,13,122,83,132,69,186,111,54,255,179,100,222,181,100,33,52,125,90,15,142,106,29,47,103,38,162,160,197,164,24,89,105,171,141,52,243,217,17,11,70,84,24,143,70,139,36,13,20,118,233,247,190,217,165,117,218,244,67,133,6,145,48,46,208,70,145,240,252,252,
-60,69,13,167,164,172,104,65,16,221,132,178,38,62,44,26,15,222,56,116,192,86,147,177,98,253,177,222,213,235,193,201,66,83,28,124,184,137,27,21,88,72,162,224,68,191,241,82,0,196,132,204,18,164,145,159,93,232,7,56,115,25,242,19,63,146,144,216,128,245,96,181,53,90,156,16,22,40,65,66,246,47,215,16,54,219,221,186,110,171,242,233,246,160,74,245,244,132,249,149,204,198,114,33,83,77,83,184,80,101,7,241,252,92,149,151,51,27,181,154,127,188,249,58,79,93,87,223,167,170,58,28,62,84,121,251,168,246,152,249,108,12,83,152,138,192,11,80,111,246,254,222,73,200,252,213,182,93,165,221,93,184,59,61,166,160,202,87,140,213,240,192,88,221,86,229,37,255,211,48,47,6,89,126,123,252,113,191,104,155,229,203,249,25,199,19,114,189,248,149,150,125,149,53,248,168,174,247,125,187,221,62,168,180,174,155,86,173,79,229,166,121,147,37,169,55,243,75,0,87,99,36,119,241,249,56,206,240,53,3,117,115,108,167,230,169,255,185,93,169,239,77,215,191,198,48,
-56,230,97,22,160,250,3,73,97,231,21,
+120,156,173,89,251,111,218,72,16,254,87,86,77,91,145,136,67,94,63,176,1,85,74,46,105,218,168,36,68,129,94,127,64,14,24,188,105,124,53,54,103,47,73,31,106,255,246,155,125,216,94,243,178,233,93,85,1,182,231,241,125,51,179,179,179,206,88,71,47,95,106,77,237,72,171,248,215,189,32,15,222,42,164,238,56,48,77,167,231,233,86,239,203,135,65,167,199,244,49,232,27,54,54,28,203,192,166,222,134,15,108,96,221,210,13,19,59,122,199,116,12,195,209,186,243,208,75,83,119,28,234,142,195,149,244,166,126,164,219,150,142,109,211,49,29,108,216,142,14,186,186,166,233,154,173,91,216,52,28,221,234,250,36,157,187,99,13,196,13,240,209,105,27,29,13,107,154,141,177,102,232,182,102,88,38,198,134,14,38,116,91,199,154,213,37,145,239,142,223,183,123,76,193,100,164,172,54,64,111,131,53,211,212,192,58,83,51,13,108,104,186,97,225,142,213,238,206,200,231,32,218,70,201,170,164,100,107,221,128,146,133,100,228,153,189,147,83,171,135,65,181,221,108,31,217,224,
+214,180,192,89,135,49,50,64,77,215,219,86,7,91,38,64,50,53,189,155,144,127,86,65,66,22,36,162,210,66,128,177,142,123,51,108,247,0,194,175,95,191,90,216,212,68,164,108,192,130,53,192,173,99,184,7,60,108,108,117,180,142,229,96,71,51,108,83,183,108,160,190,244,18,111,33,153,204,76,189,39,121,56,77,231,168,141,219,16,81,205,1,252,86,7,12,104,64,2,190,33,144,22,252,55,156,46,149,202,76,143,41,117,154,157,35,8,146,97,105,118,71,179,77,219,50,129,137,142,219,24,2,169,49,254,144,134,110,20,39,11,47,116,199,63,38,63,209,24,253,248,129,89,149,156,54,32,33,45,83,111,105,199,104,156,106,189,87,175,208,248,228,212,238,153,232,250,236,246,234,154,164,169,247,153,184,238,207,159,175,93,246,152,163,229,49,63,109,104,45,173,5,0,143,53,164,60,203,115,210,85,244,167,221,169,168,166,46,26,23,122,6,146,21,102,160,137,59,62,49,74,30,217,205,46,220,86,197,151,171,89,24,204,51,249,83,163,39,84,6,179,191,201,156,186,12,
+68,167,135,6,43,26,198,241,23,68,22,94,16,162,133,48,215,98,15,13,8,149,64,202,190,178,0,92,54,176,238,28,191,227,159,167,184,136,1,58,143,163,148,38,171,57,141,19,228,19,10,214,178,48,152,220,64,106,109,112,84,47,27,211,227,46,51,163,146,106,28,51,61,157,57,144,139,19,205,11,47,18,100,45,112,183,60,20,232,154,208,199,216,71,253,32,165,149,224,174,210,143,81,66,60,95,34,43,2,139,102,113,28,186,19,176,154,137,168,64,239,8,93,37,81,138,0,36,65,193,67,22,81,20,164,104,197,133,21,216,123,34,227,37,95,206,210,59,238,158,185,219,9,161,16,116,27,219,4,78,13,52,227,79,39,211,55,19,85,128,225,115,11,216,204,78,154,131,245,18,196,160,34,72,165,0,13,25,93,66,239,9,162,207,136,62,18,244,228,133,192,46,126,64,227,87,127,20,46,36,51,176,182,151,219,57,24,164,144,112,118,251,237,215,233,235,105,147,253,186,140,67,159,36,236,42,136,232,180,185,151,180,176,0,132,39,247,194,200,61,18,223,192,242,53,231,
+188,240,150,129,219,68,82,64,216,22,66,226,119,46,248,32,46,155,37,71,128,64,198,46,186,77,130,56,9,232,55,30,191,171,235,219,193,221,232,236,230,252,237,116,114,51,184,187,62,235,55,183,2,100,17,25,122,79,100,20,15,161,253,229,30,247,38,64,112,74,121,120,179,52,172,82,22,112,65,45,11,181,100,22,68,18,122,118,63,39,242,28,208,71,180,148,176,179,167,5,15,212,68,94,228,163,208,155,145,144,248,200,75,209,244,133,15,63,41,100,253,129,130,189,116,53,91,4,116,250,130,21,111,150,222,117,50,200,133,114,126,240,194,84,116,10,78,224,47,47,12,252,204,113,0,76,0,226,166,119,47,33,104,91,24,213,123,239,175,222,189,103,165,167,222,235,15,62,213,44,175,225,99,252,124,9,173,59,47,176,147,181,2,91,171,42,153,108,148,233,109,43,43,85,126,122,34,83,188,100,15,15,41,178,34,217,3,88,76,34,213,162,237,62,7,145,31,63,131,92,178,216,154,244,204,213,174,172,183,54,218,15,79,14,138,65,30,236,175,18,2,17,190,24,124,96,
+55,210,213,124,14,209,98,1,158,135,49,8,145,175,208,14,153,79,89,118,41,47,144,171,139,115,22,249,62,83,17,114,17,121,206,69,234,230,2,122,198,158,254,201,30,171,189,147,93,43,97,169,213,41,223,17,250,30,154,15,100,118,195,207,144,38,64,139,123,202,165,182,182,106,101,201,61,114,169,154,244,192,42,131,76,146,27,111,145,237,96,147,123,225,246,126,205,125,33,184,11,66,202,37,80,4,34,117,153,11,163,111,89,176,106,185,231,146,21,254,15,10,253,112,197,135,137,42,231,66,170,42,246,169,16,43,251,150,57,216,229,29,90,213,40,80,130,207,46,238,17,251,84,156,75,161,26,254,65,18,209,160,126,2,238,200,156,4,79,196,175,192,160,138,85,161,72,164,236,65,56,250,94,74,175,99,63,120,8,230,30,13,226,168,2,207,54,241,42,92,48,123,82,180,80,148,14,2,200,183,183,106,96,170,88,21,160,185,148,85,113,212,88,177,163,184,162,90,71,241,46,207,211,23,52,134,141,81,244,108,207,247,19,48,156,247,194,234,16,156,87,56,62,63,223,237,
+120,62,255,125,199,127,86,122,254,115,159,235,217,127,241,13,125,39,133,113,224,9,54,255,205,6,157,109,189,101,185,202,101,90,136,214,69,33,175,134,212,163,171,116,47,142,146,100,37,18,46,85,23,68,54,4,237,245,159,79,74,21,174,179,1,175,118,30,130,239,114,221,93,124,26,220,93,100,81,135,187,149,36,65,230,128,118,24,44,3,24,19,183,4,57,223,245,75,114,170,247,119,30,248,77,82,181,19,74,169,22,26,197,104,6,75,222,11,217,208,58,35,48,41,17,102,232,134,124,45,140,53,142,235,226,44,169,77,27,98,49,176,179,71,241,139,157,66,54,102,69,149,67,201,6,31,26,215,214,86,105,104,124,45,135,70,56,188,242,25,160,185,101,49,238,82,16,187,246,198,17,37,23,137,70,223,150,234,81,2,192,165,48,173,125,165,69,4,145,239,81,15,133,193,23,194,231,11,101,54,47,0,137,21,94,122,34,60,243,121,144,130,15,117,164,231,62,235,119,221,59,178,12,191,85,182,94,41,165,22,69,157,140,158,249,190,90,121,253,219,179,139,187,254,213,112,
+180,51,125,37,5,183,80,144,131,253,153,232,114,252,53,65,129,36,31,198,213,199,53,35,160,58,156,54,248,75,12,84,174,181,166,184,57,127,244,18,56,177,212,1,94,62,240,115,117,144,217,12,173,60,132,144,237,85,84,170,161,82,5,190,113,25,137,233,100,52,40,43,101,158,212,91,28,117,86,177,223,89,128,182,217,187,249,216,239,111,198,83,0,43,23,86,94,131,133,173,218,71,142,98,40,93,139,243,90,80,159,226,192,151,199,144,98,66,61,40,164,114,96,117,213,19,12,77,215,231,89,117,73,73,133,3,184,240,161,124,179,100,14,160,198,45,28,202,172,56,173,108,79,126,133,166,104,28,155,185,86,236,150,111,9,133,250,113,41,15,222,34,26,252,247,238,158,61,92,159,195,183,243,82,135,82,201,137,46,118,165,184,52,172,43,137,6,141,131,234,53,63,198,212,101,162,158,106,254,7,30,202,209,231,119,89,176,87,128,60,190,75,42,223,89,102,187,233,222,132,228,74,187,223,95,130,220,246,183,103,219,54,209,172,7,201,84,203,194,98,234,55,171,48,220,172,
+72,110,189,104,55,101,181,250,236,47,72,200,212,190,149,35,176,135,249,154,194,111,176,95,75,165,47,13,138,154,92,170,109,135,219,168,201,69,188,80,134,49,244,137,191,164,173,120,241,44,229,212,13,155,61,40,94,36,167,108,82,101,34,181,70,179,225,198,168,206,182,198,61,81,92,27,215,119,236,109,101,169,93,75,128,63,85,71,156,178,90,221,90,224,175,74,47,131,144,84,237,63,5,143,92,229,192,46,253,0,42,188,151,42,148,192,86,193,137,198,168,181,72,63,115,65,133,89,174,215,218,248,115,5,155,192,249,31,43,162,24,50,23,207,66,178,80,51,7,95,238,191,96,183,25,211,
 
diff --git a/bazaar/MAPIEx/src.tpp/all.i b/bazaar/MAPIEx/src.tpp/all.i
index dcd7223a2..d773369f7 100644
--- a/bazaar/MAPIEx/src.tpp/all.i
+++ b/bazaar/MAPIEx/src.tpp/all.i
@@ -6,6 +6,10 @@ TOPIC("MAPIAppointment$en-us")
 #include "MAPIAppointment$en-us.tppi"
 END_TOPIC
 
+TOPIC("MAPIAttachment$en-us")
+#include "MAPIAttachment$en-us.tppi"
+END_TOPIC
+
 TOPIC("MAPIContact$en-us")
 #include "MAPIContact$en-us.tppi"
 END_TOPIC
diff --git a/bazaar/MAPIEx/srcdoc.tpp/License$en-us.tpp b/bazaar/MAPIEx/srcdoc.tpp/License$en-us.tpp
index f4c3e321f..eb8e0e39b 100644
--- a/bazaar/MAPIEx/srcdoc.tpp/License$en-us.tpp
+++ b/bazaar/MAPIEx/srcdoc.tpp/License$en-us.tpp
@@ -18,7 +18,8 @@ community to benefit.]&]
 iEx.asp]&]
 [s0;2 &]
 [s0; [2 Following this license all changes have been reported to copyright 
-holder. See this post.]&]
+holder. ][^http`:`/`/www`.codeproject`.com`/KB`/IP`/CMapiEx`.aspx`?msg`=3876041`#xx3876041xx^2 S
+ee this post][2 .]&]
 [s0;2 &]
 [s0; [2 CMAPIEx contains code from ][^http`:`/`/www`.wischik`.com`/lu`/programmer`/mapi`_utils`.html^2 L
 ucian Wischik MAPI Utils][2 . Its license is:]&]
diff --git a/bazaar/MAPIEx/srcdoc.tpp/License$en-us.tppi b/bazaar/MAPIEx/srcdoc.tpp/License$en-us.tppi
index 050e673d2..945dad803 100644
--- a/bazaar/MAPIEx/srcdoc.tpp/License$en-us.tppi
+++ b/bazaar/MAPIEx/srcdoc.tpp/License$en-us.tppi
@@ -1,6 +1,6 @@
 TITLE("MAPIEx License")
 COMPRESSED
-120,156,149,83,107,79,219,48,20,253,43,87,218,67,140,66,94,125,208,149,79,91,97,18,18,32,4,84,251,80,5,236,58,183,141,135,99,71,182,67,41,211,254,251,174,19,64,90,7,154,150,47,177,226,123,206,61,231,222,147,57,188,127,159,236,37,239,146,127,60,147,35,92,242,70,249,124,206,199,253,195,221,203,17,225,82,194,245,211,126,154,164,163,108,112,48,200,146,126,146,13,210,108,152,142,199,131,244,96,56,238,127,30,141,38,130,215,94,26,157,207,127,222,254,250,112,124,190,63,187,130,185,75,14,97,190,123,217,75,199,3,56,251,114,113,114,252,0,167,82,160,118,152,127,204,195,109,6,221,27,230,217,115,193,140,245,88,15,190,242,71,206,45,212,124,133,32,29,44,27,165,54,176,224,14,11,144,26,242,249,77,233,125,205,38,44,102,241,122,189,102,81,213,20,44,18,156,197,29,11,139,30,101,125,147,193,185,65,5,71,82,41,190,48,205,170,132,105,119,157,83,187,8,78,188,3,213,201,161,30,147,191,36,77,123,7,67,152,154,122,99,229,170,244,176,51,
-253,4,89,146,12,217,126,150,164,201,222,54,247,19,188,5,253,193,112,93,146,1,103,26,43,16,132,41,58,63,22,17,188,129,134,90,115,93,64,101,10,185,220,64,109,205,189,44,200,163,15,24,109,60,169,3,139,21,151,218,145,111,207,133,111,203,125,201,195,97,3,168,75,174,5,86,168,201,139,177,176,104,86,176,148,15,232,128,91,132,218,56,31,200,12,1,144,156,20,120,97,205,15,36,146,118,174,37,93,75,189,234,154,9,197,29,233,34,142,80,43,76,85,53,90,250,77,0,47,80,227,82,250,232,77,135,51,71,116,19,112,193,211,86,35,110,201,131,34,147,30,194,198,38,113,88,87,20,198,80,119,21,116,174,98,178,134,86,163,143,167,103,188,150,199,15,17,119,245,43,9,249,102,148,50,235,23,201,207,187,227,74,129,160,57,172,200,118,201,239,145,4,163,166,177,213,198,62,217,23,47,75,44,141,42,208,70,112,213,106,37,146,48,163,232,149,94,79,73,33,40,141,61,140,191,93,221,210,154,234,149,244,173,165,19,165,188,99,193,12,139,85,195,98,114,183,
-178,188,170,208,178,184,34,79,236,182,241,82,57,22,149,190,82,20,204,211,70,72,174,225,123,7,108,179,15,179,80,241,31,209,108,131,213,202,218,17,109,52,179,16,205,100,180,69,254,246,222,174,203,173,68,134,108,81,172,140,166,239,68,80,24,88,75,95,130,244,176,166,196,225,61,182,233,216,144,180,59,220,163,64,10,213,20,97,29,116,50,150,198,205,219,60,81,57,253,163,33,66,104,73,136,10,177,46,26,225,93,148,231,191,1,139,114,122,10,
+120,156,149,147,107,79,219,48,20,134,255,202,145,96,19,163,144,91,175,43,154,166,209,49,9,13,16,2,170,125,168,10,54,142,155,120,56,118,100,59,52,101,218,127,223,113,82,208,214,21,77,235,151,186,245,185,188,239,57,143,103,176,187,27,29,68,59,209,63,62,227,207,124,65,43,233,230,51,58,234,30,237,95,13,48,47,198,188,110,220,141,163,120,144,244,134,189,36,234,70,73,47,78,250,241,104,212,139,135,253,81,247,253,96,48,102,180,116,66,171,249,236,199,221,207,55,39,23,135,211,107,152,217,232,8,102,251,87,157,120,212,131,243,79,151,167,39,53,156,9,198,149,229,243,183,115,127,155,64,251,13,179,228,57,96,74,58,164,3,199,244,137,82,3,37,205,56,8,11,139,74,202,21,220,83,203,83,16,10,230,179,219,220,185,146,140,73,72,194,229,114,73,130,162,74,73,192,40,9,219,42,36,120,18,229,109,2,23,154,75,248,44,164,164,247,186,202,114,152,180,215,115,108,23,192,169,179,32,91,57,216,99,252,151,164,73,103,216,135,137,46,87,70,100,185,131,
+189,201,59,72,162,168,79,14,147,40,142,14,54,107,175,211,155,164,63,42,220,228,104,192,234,202,48,14,76,167,173,31,195,57,56,13,21,182,166,42,133,66,167,98,177,130,210,232,71,145,162,71,231,115,148,118,168,14,12,47,168,80,22,125,59,202,92,19,238,114,234,15,43,224,42,167,138,241,130,43,244,162,13,220,87,25,44,68,205,45,80,195,161,212,214,249,98,26,19,56,58,73,249,165,209,223,57,22,105,230,154,227,181,80,89,219,140,73,106,81,23,214,240,177,76,23,69,165,132,91,249,228,123,174,248,66,184,224,85,135,83,139,229,198,96,189,167,141,70,212,160,7,137,38,29,248,141,141,67,191,174,192,143,161,108,35,240,92,132,104,141,27,197,93,56,57,167,165,56,169,3,106,203,45,132,124,209,82,234,229,139,228,231,221,81,41,129,225,28,50,180,157,211,71,142,130,185,194,177,149,218,172,237,179,151,37,230,90,166,220,4,91,8,250,77,147,255,81,144,240,235,49,9,79,47,201,179,40,226,85,213,228,99,97,51,242,161,59,26,14,162,94,76,118,234,122,
+125,172,107,228,237,186,25,1,106,243,163,111,40,219,98,99,13,33,170,194,141,250,205,54,84,44,140,46,182,200,90,10,203,114,241,176,150,36,43,18,162,200,204,208,162,224,134,132,5,42,35,119,149,19,210,146,32,119,133,68,13,103,21,19,84,193,183,54,177,121,86,48,245,17,255,65,125,195,108,35,107,143,53,212,39,158,250,104,176,81,252,117,36,110,242,13,216,61,182,72,172,86,248,63,22,72,53,44,133,203,65,56,88,34,204,252,145,55,224,173,80,218,3,63,64,214,153,172,82,191,105,60,105,131,155,164,13,170,24,142,207,223,211,201,13,10,145,254,197,164,21,115,54,152,207,127,1,208,40,152,8,
 
diff --git a/bazaar/MAPIEx/srcdoc.tpp/MAPIEx$en-us.tpp b/bazaar/MAPIEx/srcdoc.tpp/MAPIEx$en-us.tpp
index c7ace21f7..67583a318 100644
--- a/bazaar/MAPIEx/srcdoc.tpp/MAPIEx$en-us.tpp
+++ b/bazaar/MAPIEx/srcdoc.tpp/MAPIEx$en-us.tpp
@@ -21,7 +21,7 @@ ucian Wischik MAPI Utils][2 .]&]
 No heap errors are expected as now all user variables are in 
 the stack. In addition internal use of heap has been reduced.]&]
 [s0;i150;O0; [2 The library interface from user point of view has been 
-simplified. GetContents() use is now internal.]&]
+simplified. GetContents() and GetHierarchy() use is now private.]&]
 [s0;i150;O0; [2 To improve compatibility CString and TCHAR have been 
 removed. They have been substituted by String.]&]
 [s0;i150;O0; [2 Added documentation.]&]
@@ -32,8 +32,8 @@ removed. They have been substituted by String.]&]
 [s0;i150;O0; [^topic`:`/`/MAPIEx`/src`/MAPIEx`$en`-us^2 MAPIEx]&]
 [s0;i150;O0; [^topic`:`/`/MAPIEx`/src`/MAPIFolder`$en`-us^2 MAPIFolder]&]
 [s0;i150;O0; [^topic`:`/`/MAPIEx`/src`/MAPIMessage`$en`-us^2 MAPIMessage]&]
-[s0;i150;O0; [^topic`:`/`/MAPIEx`/src`/MAPIAppointment`$en`-us^2 MAPIAppoin][^topic`:`/`/Functions4U`/src`/SvgColors`$en`-us^2 t
-ment]&]
+[s0;i150;O0; [^topic`:`/`/MAPIEx`/src`/MAPIAppointment`$en`-us^2 MAPIAppointment]&]
+[s0;i150;O0; [^topic`:`/`/MAPIEx`/src`/MAPIAttachment`$en`-us^2 MAPIAttachment]&]
 [s0;i150;O0; [^topic`:`/`/MAPIEx`/src`/MAPIContact`$en`-us^2 MAPIContact]&]
 [s0;2 &]
 [s0;2 &]
diff --git a/bazaar/MAPIEx/srcdoc.tpp/MAPIEx$en-us.tppi b/bazaar/MAPIEx/srcdoc.tpp/MAPIEx$en-us.tppi
index fb2268137..0880b541f 100644
--- a/bazaar/MAPIEx/srcdoc.tpp/MAPIEx$en-us.tppi
+++ b/bazaar/MAPIEx/srcdoc.tpp/MAPIEx$en-us.tppi
@@ -1,7 +1,7 @@
 TITLE("General description")
 COMPRESSED
-120,156,149,85,109,83,34,71,16,254,43,93,198,164,238,18,15,88,64,143,232,39,10,189,139,85,234,165,78,45,63,80,232,14,179,13,59,197,236,204,214,188,176,146,84,254,123,122,118,150,3,41,140,145,47,236,188,244,211,79,247,211,221,51,134,195,195,206,81,231,167,206,27,191,211,115,156,49,47,221,100,204,6,189,179,95,191,159,144,93,66,118,189,164,151,116,146,147,110,255,115,191,219,233,117,186,253,164,123,156,12,6,253,228,243,241,160,247,251,201,201,41,103,165,19,90,77,198,127,63,253,243,243,197,205,167,251,91,24,219,228,12,198,191,37,131,62,92,15,255,188,188,120,158,252,50,25,219,14,237,117,155,13,200,153,202,36,90,184,22,220,104,171,103,14,190,121,39,181,94,0,74,44,80,57,11,204,66,129,214,178,57,218,35,152,105,153,161,161,15,174,149,99,60,28,171,12,88,89,106,161,92,188,239,114,163,253,60,135,139,103,135,42,195,172,118,5,31,174,35,6,208,226,99,171,33,210,133,13,161,7,225,242,53,171,149,246,192,153,2,158,35,39,38,5,19,
-114,227,89,151,168,106,175,150,45,49,30,90,16,138,75,159,9,53,7,81,4,166,145,150,35,138,121,205,138,8,27,100,14,55,188,181,129,140,98,116,63,32,130,69,227,164,5,215,76,173,192,138,162,148,116,254,204,194,63,221,48,216,56,162,168,132,106,216,166,79,25,22,26,74,198,23,228,121,95,104,77,84,130,16,160,50,148,44,52,160,103,48,25,63,230,206,149,233,105,218,78,219,85,85,165,173,194,103,105,139,179,180,221,32,183,254,18,229,99,23,110,52,74,56,23,82,178,105,157,217,81,3,40,197,212,48,179,154,144,11,184,116,49,52,161,44,125,100,8,51,163,139,61,46,42,97,121,46,22,228,70,23,105,91,250,180,93,26,61,55,172,40,208,164,237,130,149,34,125,242,142,242,145,182,114,87,72,242,126,229,185,32,45,30,162,97,84,243,62,220,8,126,247,133,123,151,35,80,74,131,124,76,5,45,232,211,160,100,161,60,109,46,74,168,130,212,218,136,185,80,76,70,182,121,208,114,138,168,78,119,0,69,114,220,57,251,22,129,211,3,133,85,122,80,43,149,
-30,68,245,194,146,100,81,218,129,66,30,106,204,172,130,67,111,41,201,77,104,45,202,32,228,200,74,64,99,180,137,66,226,115,137,220,145,144,84,223,74,87,192,164,140,70,75,102,4,155,110,244,166,130,70,176,84,52,139,22,92,82,229,101,153,8,145,208,137,67,19,2,32,171,32,103,237,32,39,180,16,6,5,156,121,142,217,58,63,219,97,132,252,52,210,69,144,25,227,141,94,145,117,232,165,128,184,20,88,109,16,235,106,20,51,65,160,240,21,221,136,212,14,149,253,225,99,77,64,196,40,214,164,246,250,213,212,28,148,146,101,232,130,162,36,61,166,66,10,183,130,209,173,51,161,117,66,94,239,70,127,12,191,111,228,160,56,10,50,32,151,196,122,181,181,111,253,212,58,225,124,200,224,116,5,17,97,159,215,97,22,186,37,211,220,135,70,172,139,96,183,104,246,244,10,151,204,218,40,193,235,21,241,232,116,41,120,44,238,166,99,218,214,240,31,139,67,84,233,39,111,31,187,47,199,223,255,4,248,82,207,130,29,144,184,249,62,160,102,242,237,32,53,187,239,131,
-26,110,6,237,14,92,60,153,188,48,255,226,21,175,155,174,127,223,96,220,46,231,35,45,169,5,182,172,107,180,247,209,24,197,33,186,67,161,217,253,15,113,135,118,173,175,183,245,92,104,58,104,243,250,8,53,51,204,58,227,185,243,6,143,64,184,250,33,208,74,174,160,210,102,17,250,241,65,168,76,87,246,149,209,99,234,94,96,210,106,154,182,147,215,226,160,122,76,219,163,56,159,174,244,124,43,146,27,172,226,91,176,158,94,82,207,195,164,59,122,3,236,74,112,84,118,91,229,102,167,30,207,245,115,244,6,194,157,62,215,91,230,97,73,115,194,186,151,115,118,242,47,100,133,192,225,
+120,156,149,85,109,111,227,54,12,254,43,68,215,13,119,91,47,239,237,101,237,167,32,237,238,10,180,189,225,174,135,126,8,210,90,145,153,152,136,44,25,146,28,55,27,246,223,71,89,110,147,11,210,117,205,151,216,148,249,144,15,31,146,154,192,225,97,231,168,243,83,231,149,223,233,57,206,69,169,252,116,34,134,253,179,95,191,158,176,95,151,253,250,221,126,183,211,61,233,13,62,14,122,157,126,167,55,232,246,142,187,195,225,160,251,241,120,216,255,253,228,228,84,138,194,147,209,211,201,223,15,255,252,124,113,243,225,251,55,152,184,238,25,76,126,235,14,7,112,61,250,243,242,226,113,250,203,116,226,58,108,235,53,6,200,132,78,21,58,184,38,105,141,51,115,15,95,74,175,140,89,2,42,204,81,123,7,194,65,142,206,137,5,186,35,152,27,149,162,229,7,105,180,23,50,28,235,20,68,81,24,210,62,126,239,51,107,202,69,6,23,143,30,117,138,105,29,10,222,93,71,12,224,151,247,173,38,145,30,108,18,186,35,159,61,101,181,54,37,72,161,65,102,40,57,147,
+92,144,218,68,54,5,234,58,170,19,43,140,135,14,72,75,85,166,164,23,64,121,200,52,166,229,57,197,172,206,138,19,182,40,60,110,242,54,22,82,230,232,159,33,130,71,19,164,5,215,66,175,193,81,94,40,62,127,20,225,159,191,176,216,4,98,86,164,155,108,147,135,20,115,3,133,144,75,142,188,143,90,195,138,24,1,42,203,197,66,11,102,14,211,201,125,230,125,145,156,38,237,164,93,85,85,210,202,203,52,105,73,145,180,27,228,214,95,84,220,247,224,198,160,130,115,82,74,204,234,202,142,27,64,69,51,43,236,122,202,33,224,210,71,106,164,29,63,164,8,115,107,242,61,33,42,114,50,163,37,135,49,121,210,86,101,210,46,172,89,88,145,231,104,147,118,46,10,74,30,74,207,245,72,90,153,207,21,71,191,42,37,177,22,119,209,49,170,249,61,124,17,226,238,163,123,155,33,112,73,131,124,66,7,45,248,209,162,18,161,61,93,70,5,84,65,106,99,105,65,90,168,152,109,22,180,156,33,234,211,29,64,234,30,119,206,190,68,224,228,64,99,149,28,212,74,
+37,7,81,189,240,202,178,104,227,65,163,12,61,102,215,33,96,233,184,200,13,181,22,87,16,50,20,5,160,181,198,70,33,241,177,64,233,89,72,238,111,109,42,16,74,69,167,149,176,36,102,27,189,185,161,17,28,55,205,178,5,151,220,121,105,74,129,9,159,120,180,129,0,123,5,57,235,0,25,163,5,26,76,56,45,37,166,79,245,217,166,17,234,211,72,23,65,230,66,54,122,197,172,195,44,5,196,21,97,181,65,172,187,145,230,196,160,240,9,253,152,213,14,157,253,238,125,93,15,182,124,38,100,76,153,173,217,20,114,162,72,172,176,180,226,206,223,155,137,225,113,225,34,173,194,92,228,5,43,52,35,69,126,13,227,111,222,134,97,10,200,183,227,207,163,175,27,129,152,89,206,14,156,4,243,88,111,217,93,57,115,158,124,25,106,58,91,67,68,216,23,117,148,134,249,73,141,44,195,104,214,109,177,219,70,123,166,71,42,225,92,20,229,229,30,185,247,166,32,25,219,189,153,161,182,179,242,249,229,16,117,242,161,116,247,189,31,23,226,255,4,248,163,222,14,59,
+32,209,248,54,160,102,23,238,32,53,214,183,65,141,54,171,119,7,110,235,228,141,144,207,107,115,23,241,249,224,109,128,227,184,115,119,208,26,235,127,40,63,114,79,226,151,174,94,35,205,192,109,46,43,210,115,43,156,183,165,244,165,197,35,32,95,223,27,70,171,53,84,198,46,195,248,222,145,78,77,229,94,216,84,182,158,19,161,156,225,229,60,125,137,7,55,107,210,30,199,117,118,101,22,91,76,110,176,138,87,199,211,178,83,102,17,22,227,209,43,96,87,36,81,187,237,22,104,44,245,54,175,111,175,87,16,110,205,185,217,114,15,175,188,86,156,255,113,45,79,255,5,31,228,207,50,