This patch also fixes the message builder to not override other headers that already exist to avoid overriding sanitized header entries.
