Fix so forward as attachment works if additional attachment is added by message_compose hook (#1489000)
Prevent from re-adding the same forward attachment on compose page refresh

Conflicts:

	CHANGELOG