Add local settings and fix mail