418535ec — Matthias Beyer Merge branch 'imag-mail/list-format' into master 2 years ago