Issue #2358993 by rpayanm, JeroenT: Remove usage of drupal_mail_system()