Fix positioning
Remove unneeded status() call
Merge branch 'master' into imp_6_2

Conflicts:
	imp/lib/Mbox/Generate.php