Remove "HTML message" from attachments list while viewing a message in text mode (#1486939)
Fix possible header duplicates when using additional headers (#1489033)