Reviewed-on: https://gerrit.libreoffice.org/17755Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
(cherry picked from commit cd3ca5b2)

Conflicts:
	svx/source/dialog/imapdlg.cxx

Change-Id: Id69a03b0379becc4c267a85eb7567bbbd41ccf82