Don't clear References and in-Reply-To when a message is "edited as new" (#1489216)

Conflicts:

	CHANGELOG