Refactor a bit; move a couple methods from UserMailer (?!) to User. Use the proper...