Fix "could not load message" error on valid empty message body (#1489228)

Conflicts:

	CHANGELOG