mailserver: bring 'mailserver' files into line with others