model changes, email sending settings and view
merged changes for regex improvement