Updates/bugfixes to subscription email.