- last mail header changes...
Merge remote-tracking branch 'origin/master'

Conflicts:
	manager/mail-to-all.php