Fix bug where "With attachment" option in search filter wasn't selected after return from mail view (#1489774)

Conflicts:

	CHANGELOG