Fix bcc and message content