(cherry picked from commit 093977b1)

Conflicts:
	offapi/com/sun/star/system/makefile.mk
	shell/source/cmdmail/cmdmailmsg.cxx
	shell/source/cmdmail/cmdmailmsg.hxx
	shell/source/win32/simplemail/smplmailclient.cxx
	shell/source/win32/simplemail/smplmailclient.hxx
	shell/source/win32/simplemail/smplmailmsg.hxx
	shell/source/win32/simplemail/smplmailsuppl.hxx

Change-Id: Ief1aefee32a6750dfed96476d2968ce76b038440