Fix a bug where the subject was getting set to the message field value.