misc little email tweaks