Fix message save crashes and reintroduce the previously reverted commit to fix sending to bcc