	* Reverted previous fix 	* Added a proper fix for the crash provoked by last two commits
	* Reverted previous fix
	* Added a proper fix for the crash provoked by last two commits

pmo-trunk-r4765

community-ssu/modest,community-ssu/modest,community-ssu/modest,community-ssu/modest