Index: /Mulberry/branches/users/shared/v4.1d1/Sources_Common/Plugins/SSL/loadsslfunc.cp
===================================================================
--- /Mulberry/branches/users/shared/v4.1d1/Sources_Common/Plugins/SSL/loadsslfunc.cp (revision 316)
+++ /Mulberry/branches/users/shared/v4.1d1/Sources_Common/Plugins/SSL/loadsslfunc.cp (revision 328)
@@ -580,5 +580,10 @@
 
 //char *SSL_CIPHER_description(SSL_CIPHER *s,char *buf,int size);
+// argument was constified in 0.9.8m
+#if OPENSSL_VERSION_NUMBER >= 0x009080dfL
+IMPORT_FUNCTION(sSSLLoader, char *, SSL_CIPHER_description, (const SSL_CIPHER *s,char *buf,int size), (s, buf, size))
+#else
 IMPORT_FUNCTION(sSSLLoader, char *, SSL_CIPHER_description, (SSL_CIPHER *s,char *buf,int size), (s, buf, size))
+#endif
 
 //int	SSL_CIPHER_get_bits(SSL_CIPHER *c,int *alg_bits);
Index: /Mulberry/branches/users/shared/v4.1d1/Plug-ins/SSL/SSL.vcproj
===================================================================
--- /Mulberry/branches/users/shared/v4.1d1/Plug-ins/SSL/SSL.vcproj (revision 316)
+++ /Mulberry/branches/users/shared/v4.1d1/Plug-ins/SSL/SSL.vcproj (revision 328)
@@ -42,5 +42,5 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=""$(ProjectDir)sources";"$(ProjectDir)..\Common";"$(ProjectDir)..\..\Sources_Common\i18n";"$(ProjectDir)..\..\Sources_Common\i18n\Charsets";"$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters";"$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte";"$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode";"$(ProjectDir)..\..\Sources_Common\Mail\URLs";"$(ProjectDir)..\..\Sources_Common\Utilities";"$(ProjectDir)..\..\Win32\Sources\VCPP";"$(ProjectDir)..\..\..\Libraries\openssl\inc32""
+				AdditionalIncludeDirectories=""$(ProjectDir)sources";"$(ProjectDir)..\Common";"$(ProjectDir)..\..\Sources_Common\i18n";"$(ProjectDir)..\..\Sources_Common\i18n\Charsets";"$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters";"$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte";"$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode";"$(ProjectDir)..\..\Sources_Common\Mail\URLs";"$(ProjectDir)..\..\Sources_Common\Utilities";"$(ProjectDir)..\..\Win32\Sources\VCPP";"$(ProjectDir)..\..\Libraries\openssl\inc32""
 				PreprocessorDefinitions="__VCPP__"
 				MinimalRebuild="true"
@@ -66,5 +66,5 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/Def:"SSL.def""
-				AdditionalDependencies=""$(ProjectDir)..\..\..\Libraries\openssl\out32d\libeay32.lib" "$(ProjectDir)..\..\..\Libraries\openssl\out32d\ssleay32.lib" WSOCK32.lib"
+				AdditionalDependencies=""$(ProjectDir)..\..\Libraries\openssl\out32d\libeay32.lib" "$(ProjectDir)..\..\Libraries\openssl\out32d\ssleay32.lib" WSOCK32.lib"
 				LinkIncremental="2"
 				IgnoreAllDefaultLibraries="false"
Index: /Mulberry/branches/users/shared/v4.1d1/Plug-ins/SMIME/SMIME.vcproj
===================================================================
--- /Mulberry/branches/users/shared/v4.1d1/Plug-ins/SMIME/SMIME.vcproj (revision 316)
+++ /Mulberry/branches/users/shared/v4.1d1/Plug-ins/SMIME/SMIME.vcproj (revision 328)
@@ -42,5 +42,5 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=""$(ProjectDir)sources";"$(ProjectDir)sources\md5";"$(ProjectDir)..\Common";"$(ProjectDir)..\..\Sources_Common\i18n";"$(ProjectDir)..\..\Sources_Common\i18n\Charsets";"$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters";"$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte";"$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode";"$(ProjectDir)..\..\Sources_Common\Mail\URLs";"$(ProjectDir)..\..\Sources_Common\Plugins\SSL";"$(ProjectDir)..\..\Sources_Common\Utilities";"$(ProjectDir)..\..\Win32\Sources\VCPP";"$(ProjectDir)..\..\..\Libraries\openssl\inc32""
+				AdditionalIncludeDirectories=""$(ProjectDir)sources";"$(ProjectDir)sources\md5";"$(ProjectDir)..\Common";"$(ProjectDir)..\..\Sources_Common\i18n";"$(ProjectDir)..\..\Sources_Common\i18n\Charsets";"$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters";"$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\OneByte";"$(ProjectDir)..\..\Sources_Common\i18n\Charsets\Converters\Unicode";"$(ProjectDir)..\..\Sources_Common\Mail\URLs";"$(ProjectDir)..\..\Sources_Common\Plugins\SSL";"$(ProjectDir)..\..\Sources_Common\Utilities";"$(ProjectDir)..\..\Win32\Sources\VCPP";"$(ProjectDir)..\..\Libraries\openssl\inc32""
 				PreprocessorDefinitions="__VCPP__"
 				MinimalRebuild="true"
Index: /Mulberry/branches/users/shared/v4.1d1/Win32/Mulberry.vcproj
===================================================================
--- /Mulberry/branches/users/shared/v4.1d1/Win32/Mulberry.vcproj (revision 316)
+++ /Mulberry/branches/users/shared/v4.1d1/Win32/Mulberry.vcproj (revision 328)
@@ -44,5 +44,5 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=""$(ProjectDir)Sources";"$(ProjectDir)Sources\Application";"$(ProjectDir)Sources\Application\Address_Book";"$(ProjectDir)Sources\Application\Address_Book_Manager";"$(ProjectDir)Sources\Application\Address_Book_Manager\Address_Book_Properties";"$(ProjectDir)Sources\Application\Address_Search";"$(ProjectDir)Sources\Application\Calendar";"$(ProjectDir)Sources\Application\Calendar\Calendar_Properties";"$(ProjectDir)Sources\Application\Calendar\Calendar_View";"$(ProjectDir)Sources\Application\Calendar\Calendar_View\Calendar_Store_View";"$(ProjectDir)Sources\Application\Calendar\Calendar_View\Calendar_Window";"$(ProjectDir)Sources\Application\Calendar\Calendar_View\Day_Week_View";"$(ProjectDir)Sources\Application\Calendar\Calendar_View\Event_ToDo_Preview";"$(ProjectDir)Sources\Application\Calendar\Calendar_View\Free_Busy_View";"$(ProjectDir)Sources\Application\Calendar\Calendar_View\Month_View";"$(ProjectDir)Sources\Application\Calendar\Calendar_View\Summary_View";"$(ProjectDir)Sources\Application\Calendar\Calendar_View\ToDo_View";"$(ProjectDir)Sources\Application\Calendar\Calendar_View\Year_View";"$(ProjectDir)Sources\Application\Calendar\Component_Editing";"$(ProjectDir)Sources\Application\Calendar\Dialogs";"$(ProjectDir)Sources\Application\Calendar\Utilities";"$(ProjectDir)Sources\Application\Find_Replace";"$(ProjectDir)Sources\Application\General";"$(ProjectDir)Sources\Application\Letter";"$(ProjectDir)Sources\Application\Macros";"$(ProjectDir)Sources\Application\Mailbox";"$(ProjectDir)Sources\Application\Mailbox_Info";"$(ProjectDir)Sources\Application\Message";"$(ProjectDir)Sources\Application\Other_Dialogs";"$(ProjectDir)Sources\Application\Preferences_Dialog";"$(ProjectDir)Sources\Application\Preferences_Dialog\Edit_Identities";"$(ProjectDir)Sources\Application\Preferences_Dialog\Extras";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\Address_Account_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\Authentication_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\Calendar_Account_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\IMAP_Account_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\Local_Account_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\POP3_Account_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\Remote_Account_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\SIEVE_Account_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\SMTP_Account_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Address_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Alerts_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Attachment_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Display_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Letter_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Mailbox_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Message_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Spelling_Panels";"$(ProjectDir)Sources\Application\Rules";"$(ProjectDir)Sources\Application\Rules\Action Dialogs";"$(ProjectDir)Sources\Application\Rules\Dialog";"$(ProjectDir)Sources\Application\Search";"$(ProjectDir)Sources\Application\Server";"$(ProjectDir)Sources\Application\Server\Dialogs";"$(ProjectDir)Sources\Application\Server\Browse_Dialog";"$(ProjectDir)Sources\Application\Server\Mailbox_Properties";"$(ProjectDir)Sources\Application\Dialogs";"$(ProjectDir)Sources\Application\Mailbox_Properties";"$(ProjectDir)Sources\Application\SMTP_Queue";"$(ProjectDir)Sources\Application\Speech";"$(ProjectDir)Sources\Application\Status";"$(ProjectDir)Sources\Application\Three Pane";"$(ProjectDir)Sources\Application\Three Pane\Accounts";"$(ProjectDir)Sources\Application\Three Pane\Items";"$(ProjectDir)Sources\Application\Three Pane\Options Dialog";"$(ProjectDir)Sources\Application\Three Pane\Preview";"$(ProjectDir)Sources\Application\Windows";"$(ProjectDir)Sources\VCPP";"$(ProjectDir)Sources\Formatting";"$(ProjectDir)Sources\Plugins";"$(ProjectDir)Sources\Plugins\General";"$(ProjectDir)Sources\Plugins\Security";"$(ProjectDir)Sources\Plugins\Spelling";"$(ProjectDir)Sources\Plugins\SSL";"$(ProjectDir)Sources\PP_Sources";"$(ProjectDir)Sources\PP_Sources\Hierarchy List";"$(ProjectDir)Sources\PP_Sources\Streams";"$(ProjectDir)Sources\PP_Sources\Tables";"$(ProjectDir)Sources\PP_Sources\Undoable";"$(ProjectDir)Sources\Support";"$(ProjectDir)Sources\Support\Table";"$(ProjectDir)Sources\Support\Text";"$(ProjectDir)Sources\Support\Toolbars";"$(ProjectDir)Resources";"$(ProjectDir)..\Sources_Common";"$(ProjectDir)..\Sources_Common\Application";"$(ProjectDir)..\Sources_Common\Application\Address_Book";"$(ProjectDir)..\Sources_Common\Application\Address_Book_Manager";"$(ProjectDir)..\Sources_Common\Application\Calendar";"$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View";"$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\Calendar_Store_View";"$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\Calendar_Window";"$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\Day_Week_View";"$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\Free_Busy_View";"$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\Month_View";"$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\Summary_View";"$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\ToDo_View";"$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\Year_View";"$(ProjectDir)..\Sources_Common\Application\General";"$(ProjectDir)..\Sources_Common\Application\Letter";"$(ProjectDir)..\Sources_Common\Application\Mailbox";"$(ProjectDir)..\Sources_Common\Application\Mailbox_Info";"$(ProjectDir)..\Sources_Common\Application\Message";"$(ProjectDir)..\Sources_Common\Application\Preferences";"$(ProjectDir)..\Sources_Common\Application\Rules";"$(ProjectDir)..\Sources_Common\Application\Server";"$(ProjectDir)..\Sources_Common\Application\SMTP_Queue";"$(ProjectDir)..\Sources_Common\Application\Three_Pane";"$(ProjectDir)..\Sources_Common\Automation";"$(ProjectDir)..\Sources_Common\Calendar_Store";"$(ProjectDir)..\Sources_Common\Calendar_Store\Clients";"$(ProjectDir)..\Sources_Common\Calendar_Store\Notifications";"$(ProjectDir)..\Sources_Common\Calendar_Store\Protocols";"$(ProjectDir)..\Sources_Common\Formatting";"$(ProjectDir)..\Sources_Common\HTTP";"$(ProjectDir)..\Sources_Common\HTTP\CalDAVClient";"$(ProjectDir)..\Sources_Common\HTTP\CardDAVClient";"$(ProjectDir)..\Sources_Common\HTTP\HTTPClient";"$(ProjectDir)..\Sources_Common\HTTP\WebDAVClient";"$(ProjectDir)..\Sources_Common\i18n";"$(ProjectDir)..\Sources_Common\i18n\Charsets";"$(ProjectDir)..\Sources_Common\i18n\Charsets\Converters";"$(ProjectDir)..\Sources_Common\i18n\Charsets\Converters\ISO2022";"$(ProjectDir)..\Sources_Common\i18n\Charsets\Converters\OneByte";"$(ProjectDir)..\Sources_Common\i18n\Charsets\Converters\TwoByte";"$(ProjectDir)..\Sources_Common\i18n\Charsets\Converters\Unicode";"$(ProjectDir)..\Sources_Common\Mail";"$(ProjectDir)..\Sources_Common\Mail\Address";"$(ProjectDir)..\Sources_Common\Mail\AddressBook";"$(ProjectDir)..\Sources_Common\Mail\Attachments";"$(ProjectDir)..\Sources_Common\Mail\Charsets";"$(ProjectDir)..\Sources_Common\Mail\Control";"$(ProjectDir)..\Sources_Common\Mail\Extensions";"$(ProjectDir)..\Sources_Common\Mail\Filtering";"$(ProjectDir)..\Sources_Common\Mail\Filters";"$(ProjectDir)..\Sources_Common\Mail\INET_Clients";"$(ProjectDir)..\Sources_Common\Mail\INET_Clients\ACAP";"$(ProjectDir)..\Sources_Common\Mail\INET_Clients\IMAP";"$(ProjectDir)..\Sources_Common\Mail\INET_Clients\IMSP";"$(ProjectDir)..\Sources_Common\Mail\INET_Clients\LDAP";"$(ProjectDir)..\Sources_Common\Mail\INET_Clients\Password";"$(ProjectDir)..\Sources_Common\Mail\INET_Clients\SIEVE";"$(ProjectDir)..\Sources_Common\Mail\INET_Clients\SIEVE\SIEVE";"$(ProjectDir)..\Sources_Common\Mail\INET_Clients\SMTP";"$(ProjectDir)..\Sources_Common\Mail\Local_Clients";"$(ProjectDir)..\Sources_Common\Mail\Mailbox";"$(ProjectDir)..\Sources_Common\Mail\Message";"$(ProjectDir)..\Sources_Common\Mail\Network";"$(ProjectDir)..\Sources_Common\Mail\Protocols";"$(ProjectDir)..\Sources_Common\Mail\Search";"$(ProjectDir)..\Sources_Common\Mail\URLs";"$(ProjectDir)..\Sources_Common\Offline";"$(ProjectDir)..\Sources_Common\Offline\Mail";"$(ProjectDir)..\Sources_Common\Offline\Recording";"$(ProjectDir)..\Sources_Common\Preferences_Store\Clients";"$(ProjectDir)..\Sources_Common\Plugins";"$(ProjectDir)..\Sources_Common\Plugins\AddressBooks";"$(ProjectDir)..\Sources_Common\Plugins\Authentication";"$(ProjectDir)..\Sources_Common\Plugins\Configuration";"$(ProjectDir)..\Sources_Common\Plugins\General";"$(ProjectDir)..\Sources_Common\Plugins\PasswordChange";"$(ProjectDir)..\Sources_Common\Plugins\Security";"$(ProjectDir)..\Sources_Common\Plugins\Spelling";"$(ProjectDir)..\Sources_Common\Plugins\SSL";"$(ProjectDir)..\Sources_Common\Resources";"$(ProjectDir)..\Sources_Common\Support";"$(ProjectDir)..\Sources_Common\Support\Toolbars";"$(ProjectDir)..\Sources_Common\Tasks";"$(ProjectDir)..\Sources_Common\Utilities";"$(ProjectDir)..\Sources_Common\VCard_Store";"$(ProjectDir)..\Sources_Common\VCard_Store\Clients";"$(ProjectDir)..\Libraries\CICalendar\Source";"$(ProjectDir)..\Libraries\vCard\Source";"$(ProjectDir)..\Libraries\XMLLib\Source";"$(ProjectDir)..\Plug-ins\CRAM-MD5\sources\md5";"C:\Program Files\Microsoft Speech SDK 5.1\Include";"$(VCInstallDir)atlmfc\src\mfc";"$(ProjectDir)..\..\Libraries\openssl\inc32""
+				AdditionalIncludeDirectories=""$(ProjectDir)Sources";"$(ProjectDir)Sources\Application";"$(ProjectDir)Sources\Application\Address_Book";"$(ProjectDir)Sources\Application\Address_Book_Manager";"$(ProjectDir)Sources\Application\Address_Book_Manager\Address_Book_Properties";"$(ProjectDir)Sources\Application\Address_Search";"$(ProjectDir)Sources\Application\Calendar";"$(ProjectDir)Sources\Application\Calendar\Calendar_Properties";"$(ProjectDir)Sources\Application\Calendar\Calendar_View";"$(ProjectDir)Sources\Application\Calendar\Calendar_View\Calendar_Store_View";"$(ProjectDir)Sources\Application\Calendar\Calendar_View\Calendar_Window";"$(ProjectDir)Sources\Application\Calendar\Calendar_View\Day_Week_View";"$(ProjectDir)Sources\Application\Calendar\Calendar_View\Event_ToDo_Preview";"$(ProjectDir)Sources\Application\Calendar\Calendar_View\Free_Busy_View";"$(ProjectDir)Sources\Application\Calendar\Calendar_View\Month_View";"$(ProjectDir)Sources\Application\Calendar\Calendar_View\Summary_View";"$(ProjectDir)Sources\Application\Calendar\Calendar_View\ToDo_View";"$(ProjectDir)Sources\Application\Calendar\Calendar_View\Year_View";"$(ProjectDir)Sources\Application\Calendar\Component_Editing";"$(ProjectDir)Sources\Application\Calendar\Dialogs";"$(ProjectDir)Sources\Application\Calendar\Utilities";"$(ProjectDir)Sources\Application\Find_Replace";"$(ProjectDir)Sources\Application\General";"$(ProjectDir)Sources\Application\Letter";"$(ProjectDir)Sources\Application\Macros";"$(ProjectDir)Sources\Application\Mailbox";"$(ProjectDir)Sources\Application\Mailbox_Info";"$(ProjectDir)Sources\Application\Message";"$(ProjectDir)Sources\Application\Other_Dialogs";"$(ProjectDir)Sources\Application\Preferences_Dialog";"$(ProjectDir)Sources\Application\Preferences_Dialog\Edit_Identities";"$(ProjectDir)Sources\Application\Preferences_Dialog\Extras";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\Address_Account_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\Authentication_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\Calendar_Account_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\IMAP_Account_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\Local_Account_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\POP3_Account_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\Remote_Account_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\SIEVE_Account_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Account_Panels\SMTP_Account_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Address_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Alerts_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Attachment_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Display_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Letter_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Mailbox_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Message_Panels";"$(ProjectDir)Sources\Application\Preferences_Dialog\Sub-panels\Spelling_Panels";"$(ProjectDir)Sources\Application\Rules";"$(ProjectDir)Sources\Application\Rules\Action Dialogs";"$(ProjectDir)Sources\Application\Rules\Dialog";"$(ProjectDir)Sources\Application\Search";"$(ProjectDir)Sources\Application\Server";"$(ProjectDir)Sources\Application\Server\Dialogs";"$(ProjectDir)Sources\Application\Server\Browse_Dialog";"$(ProjectDir)Sources\Application\Server\Mailbox_Properties";"$(ProjectDir)Sources\Application\Dialogs";"$(ProjectDir)Sources\Application\Mailbox_Properties";"$(ProjectDir)Sources\Application\SMTP_Queue";"$(ProjectDir)Sources\Application\Speech";"$(ProjectDir)Sources\Application\Status";"$(ProjectDir)Sources\Application\Three Pane";"$(ProjectDir)Sources\Application\Three Pane\Accounts";"$(ProjectDir)Sources\Application\Three Pane\Items";"$(ProjectDir)Sources\Application\Three Pane\Options Dialog";"$(ProjectDir)Sources\Application\Three Pane\Preview";"$(ProjectDir)Sources\Application\Windows";"$(ProjectDir)Sources\VCPP";"$(ProjectDir)Sources\Formatting";"$(ProjectDir)Sources\Plugins";"$(ProjectDir)Sources\Plugins\General";"$(ProjectDir)Sources\Plugins\Security";"$(ProjectDir)Sources\Plugins\Spelling";"$(ProjectDir)Sources\Plugins\SSL";"$(ProjectDir)Sources\PP_Sources";"$(ProjectDir)Sources\PP_Sources\Hierarchy List";"$(ProjectDir)Sources\PP_Sources\Streams";"$(ProjectDir)Sources\PP_Sources\Tables";"$(ProjectDir)Sources\PP_Sources\Undoable";"$(ProjectDir)Sources\Support";"$(ProjectDir)Sources\Support\Table";"$(ProjectDir)Sources\Support\Text";"$(ProjectDir)Sources\Support\Toolbars";"$(ProjectDir)Resources";"$(ProjectDir)..\Sources_Common";"$(ProjectDir)..\Sources_Common\Application";"$(ProjectDir)..\Sources_Common\Application\Address_Book";"$(ProjectDir)..\Sources_Common\Application\Address_Book_Manager";"$(ProjectDir)..\Sources_Common\Application\Calendar";"$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View";"$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\Calendar_Store_View";"$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\Calendar_Window";"$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\Day_Week_View";"$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\Free_Busy_View";"$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\Month_View";"$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\Summary_View";"$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\ToDo_View";"$(ProjectDir)..\Sources_Common\Application\Calendar\Calendar_View\Year_View";"$(ProjectDir)..\Sources_Common\Application\General";"$(ProjectDir)..\Sources_Common\Application\Letter";"$(ProjectDir)..\Sources_Common\Application\Mailbox";"$(ProjectDir)..\Sources_Common\Application\Mailbox_Info";"$(ProjectDir)..\Sources_Common\Application\Message";"$(ProjectDir)..\Sources_Common\Application\Preferences";"$(ProjectDir)..\Sources_Common\Application\Rules";"$(ProjectDir)..\Sources_Common\Application\Server";"$(ProjectDir)..\Sources_Common\Application\SMTP_Queue";"$(ProjectDir)..\Sources_Common\Application\Three_Pane";"$(ProjectDir)..\Sources_Common\Automation";"$(ProjectDir)..\Sources_Common\Calendar_Store";"$(ProjectDir)..\Sources_Common\Calendar_Store\Clients";"$(ProjectDir)..\Sources_Common\Calendar_Store\Notifications";"$(ProjectDir)..\Sources_Common\Calendar_Store\Protocols";"$(ProjectDir)..\Sources_Common\Formatting";"$(ProjectDir)..\Sources_Common\HTTP";"$(ProjectDir)..\Sources_Common\HTTP\CalDAVClient";"$(ProjectDir)..\Sources_Common\HTTP\CardDAVClient";"$(ProjectDir)..\Sources_Common\HTTP\HTTPClient";"$(ProjectDir)..\Sources_Common\HTTP\WebDAVClient";"$(ProjectDir)..\Sources_Common\i18n";"$(ProjectDir)..\Sources_Common\i18n\Charsets";"$(ProjectDir)..\Sources_Common\i18n\Charsets\Converters";"$(ProjectDir)..\Sources_Common\i18n\Charsets\Converters\ISO2022";"$(ProjectDir)..\Sources_Common\i18n\Charsets\Converters\OneByte";"$(ProjectDir)..\Sources_Common\i18n\Charsets\Converters\TwoByte";"$(ProjectDir)..\Sources_Common\i18n\Charsets\Converters\Unicode";"$(ProjectDir)..\Sources_Common\Mail";"$(ProjectDir)..\Sources_Common\Mail\Address";"$(ProjectDir)..\Sources_Common\Mail\AddressBook";"$(ProjectDir)..\Sources_Common\Mail\Attachments";"$(ProjectDir)..\Sources_Common\Mail\Charsets";"$(ProjectDir)..\Sources_Common\Mail\Control";"$(ProjectDir)..\Sources_Common\Mail\Extensions";"$(ProjectDir)..\Sources_Common\Mail\Filtering";"$(ProjectDir)..\Sources_Common\Mail\Filters";"$(ProjectDir)..\Sources_Common\Mail\INET_Clients";"$(ProjectDir)..\Sources_Common\Mail\INET_Clients\ACAP";"$(ProjectDir)..\Sources_Common\Mail\INET_Clients\IMAP";"$(ProjectDir)..\Sources_Common\Mail\INET_Clients\IMSP";"$(ProjectDir)..\Sources_Common\Mail\INET_Clients\LDAP";"$(ProjectDir)..\Sources_Common\Mail\INET_Clients\Password";"$(ProjectDir)..\Sources_Common\Mail\INET_Clients\SIEVE";"$(ProjectDir)..\Sources_Common\Mail\INET_Clients\SIEVE\SIEVE";"$(ProjectDir)..\Sources_Common\Mail\INET_Clients\SMTP";"$(ProjectDir)..\Sources_Common\Mail\Local_Clients";"$(ProjectDir)..\Sources_Common\Mail\Mailbox";"$(ProjectDir)..\Sources_Common\Mail\Message";"$(ProjectDir)..\Sources_Common\Mail\Network";"$(ProjectDir)..\Sources_Common\Mail\Protocols";"$(ProjectDir)..\Sources_Common\Mail\Search";"$(ProjectDir)..\Sources_Common\Mail\URLs";"$(ProjectDir)..\Sources_Common\Offline";"$(ProjectDir)..\Sources_Common\Offline\Mail";"$(ProjectDir)..\Sources_Common\Offline\Recording";"$(ProjectDir)..\Sources_Common\Preferences_Store\Clients";"$(ProjectDir)..\Sources_Common\Plugins";"$(ProjectDir)..\Sources_Common\Plugins\AddressBooks";"$(ProjectDir)..\Sources_Common\Plugins\Authentication";"$(ProjectDir)..\Sources_Common\Plugins\Configuration";"$(ProjectDir)..\Sources_Common\Plugins\General";"$(ProjectDir)..\Sources_Common\Plugins\PasswordChange";"$(ProjectDir)..\Sources_Common\Plugins\Security";"$(ProjectDir)..\Sources_Common\Plugins\Spelling";"$(ProjectDir)..\Sources_Common\Plugins\SSL";"$(ProjectDir)..\Sources_Common\Resources";"$(ProjectDir)..\Sources_Common\Support";"$(ProjectDir)..\Sources_Common\Support\Toolbars";"$(ProjectDir)..\Sources_Common\Tasks";"$(ProjectDir)..\Sources_Common\Utilities";"$(ProjectDir)..\Sources_Common\VCard_Store";"$(ProjectDir)..\Sources_Common\VCard_Store\Clients";"$(ProjectDir)..\Libraries\CICalendar\Source";"$(ProjectDir)..\Libraries\vCard\Source";"$(ProjectDir)..\Libraries\XMLLib\Source";"$(ProjectDir)..\Plug-ins\CRAM-MD5\sources\md5";"C:\Program Files\Microsoft Speech SDK 5.1\Include";"$(VCInstallDir)atlmfc\src\mfc";"$(ProjectDir)..\Libraries\openssl\inc32""
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__VCPP__"
 				MinimalRebuild="true"
Index: /Mulberry/branches/users/shared/v4.1d1/Win32/Sources/Application/Status/CStatusWindow.cp
===================================================================
--- /Mulberry/branches/users/shared/v4.1d1/Win32/Sources/Application/Status/CStatusWindow.cp (revision 143)
+++ /Mulberry/branches/users/shared/v4.1d1/Win32/Sources/Application/Status/CStatusWindow.cp (revision 328)
@@ -57,4 +57,7 @@
 BOOL CUTF8StatusBar::SetPaneTextUTF8(int nIndex, const char* utf8, BOOL bUpdate)
 {
+	// Don't call into CWnd code if this thread doesn't own this CWnd
+	if (!FromHandlePermanent(GetSafeHwnd()))
+		return FALSE;
 #ifdef _UNICODE
 	cdustring utf16(utf8);
@@ -105,4 +108,12 @@
 }
 
+BOOL CUTF8StatusBar::RedrawWindow(LPCRECT lpRectUpdate,
+				  CRgn* prgnUpdate,
+				  UINT flags)
+{
+	// Don't call into CWnd code if this thread doesn't own this CWnd
+	return FromHandlePermanent(GetSafeHwnd()) ? CStatusBar::RedrawWindow(lpRectUpdate, prgnUpdate, flags) : FALSE;
+}
+
 // Init status
 void CStatusWindow::InitStatusBar(CUTF8StatusBar* statusBar)
Index: /Mulberry/branches/users/shared/v4.1d1/Win32/Sources/Application/Status/CStatusWindow.h
===================================================================
--- /Mulberry/branches/users/shared/v4.1d1/Win32/Sources/Application/Status/CStatusWindow.h (revision 143)
+++ /Mulberry/branches/users/shared/v4.1d1/Win32/Sources/Application/Status/CStatusWindow.h (revision 328)
@@ -30,4 +30,10 @@
 	
 	BOOL SetPaneTextUTF8(int nIndex, const char* utf8, BOOL bUpdate = TRUE);
+
+	BOOL RedrawWindow(
+			  LPCRECT lpRectUpdate = NULL,
+			  CRgn* prgnUpdate = NULL,
+			  UINT flags = RDW_INVALIDATE | RDW_UPDATENOW | RDW_ERASE 
+			 );
 };
 
Index: /Mulberry/branches/users/shared/v4.1d1/Win32/Sources/Application/Server/Browse_Dialog/CServerBrowseTable.cp
===================================================================
--- /Mulberry/branches/users/shared/v4.1d1/Win32/Sources/Application/Server/Browse_Dialog/CServerBrowseTable.cp (revision 143)
+++ /Mulberry/branches/users/shared/v4.1d1/Win32/Sources/Application/Server/Browse_Dialog/CServerBrowseTable.cp (revision 328)
@@ -69,5 +69,6 @@
 
 	// Allow multiple selections
-	ModifyStyle(0, LVS_SINGLESEL);
+	if (m_hWnd)
+		ModifyStyle(0, LVS_SINGLESEL);
 }
 
Index: /Mulberry/branches/users/shared/v4.1d1/Win32/Sources/Support/Toolbars/CToolbar.cp
===================================================================
--- /Mulberry/branches/users/shared/v4.1d1/Win32/Sources/Support/Toolbars/CToolbar.cp (revision 316)
+++ /Mulberry/branches/users/shared/v4.1d1/Win32/Sources/Support/Toolbars/CToolbar.cp (revision 328)
@@ -679,6 +679,8 @@
 	
 	// Only if commander available
-	if (GetCommander())
-		cmdui.DoUpdate(GetCommander(), true);
+	CWnd* commander = GetCommander();
+	if (commander)
+		// we recreate the CWnd as we got it from another thread
+		cmdui.DoUpdate(CWnd::FromHandle(commander->GetSafeHwnd()), true);
 	
 	// Check for visibility change tied to enable state