Feature/smtp settings changes