Merge branch 'master' into 'master'

Fix #4222 (sorting mail quota / mail traffic) align columns to be more consistent and clearer.

Closes #4222

See merge request ispconfig/ispconfig3!740