Fixed make_bcc_file () to use contents of From: in draft, if draft_from masquerade...