[FIX] flag to merge body content
Merge remote-tracking branch 'origin/7.0' into add_menu

Conflicts:
	l10n_it_pec_messages/model/mail_thread.py