Make the list of configured entries better readable with the label of the plugin and some other changes
Group the mail configuration in a 'modules' config container
Remove old no longer used code finally from the modules file and the configuration