Fix handling of message/rfc822 attachments on message forward and edit (#1489214)

Conflicts:

	CHANGELOG
	program/steps/mail/compose.inc