Empty recipient field bug fix