CakeEmail: Backport e9b613de7d into 1.4.x
Merge branch '1.5'

Conflicts:
	Plugin/Contacts/Controller/ContactsController.php