Allow incoming email to work with custom domains links

formatting TODOs