as per IRC, this really did want to be 'mailcomposer', so please basically back out the changes to this file (switch back to $mailcomposer too)