This reverts commit 97fd990e, reversing
changes made to f451a697.

Conflicts:
	app/mailers/emails/notes.rb
	app/mailers/emails/projects.rb