Fix saving draft just after entering compose window (#1489012)

Conflicts:

	CHANGELOG