Fix deadlock situation if adding a skipped mail fails