Make possible to get contact ID from HTML id attribute (#1489414)
Fix broken text/* attachments when forwarding/editing a message (#1489426)