mail templates moved to correct place