Fixing a bug that could cause phantom emails.