Handle fromdomain properly when there is no @ sign