Changing fakoli so that the from address in templates now also affects the emails actual from address.  It used to just affect the reply-to address