Several adjustments for the E-Mail capabilities, to get them better fit for our needs - View it on GitHub