Bug rewrite mail