Add text part for multipart support
Merge branch '12-multipart-mail' into lucid

Conflicts:
	app/views/mention_mailer/notify_mentioning.text.erb