Revert "rewrite if block guard to return guard"

This reverts commit fb3fae5a1b0e9b4dee6cd896fc641c2d2a53e67b.

Conflicts:
	app/mailers/application_mailer.rb