[fix bug 690540 v2] from mail address changed to settings.FROM_NOREPLY
Merge pull request #496 from fxa90id/Bug_690540_fix

[fix bug 690540 v2] from mail changed to settings.FROM_NOREPLY