update for valhalla mail
fix merge conflicts in valhalla_mail