Import mailing list module - cleaner
updated
completed
Fixed merge conflicts from the pull request