Bug 851511 - Debug another error with automatic emails.
Merge pull request #1142 from AdrianGaudebert/851511-fix-automatic-emails

Bug 851511 - Debug another error with automatic emails.