FIX: Additional check before maildeletion
ADD: Test for faulty mail deletion