Fixes for refback mail