Fix: if one email fails the status is never completed
Merge with master