diff --git a/ba/ba7100.cpp b/ba/ba7100.cpp
index 28bee9ecd..88aa10621 100755
--- a/ba/ba7100.cpp
+++ b/ba/ba7100.cpp
@@ -552,7 +552,8 @@ void TMailer_mask::test_delete()
 				row->get(sender_pos, file); // Cartella di provenienza
 				file.add(id);
 				file.ext("ini");
-				deleted = xvt_fsys_remove_file(file) != 0;
+				xvt_fsys_remove_file(file) != 0;
+				deleted = true;
 			}
 			else
 				if (mailer == "MAPI")
@@ -1392,16 +1393,15 @@ void TMailer_mask::auto_save_all()
   if (_mail_semaphore == 0)
   { 
     TSheet_field& sf = sfield(F_MESSAGES);
+
 #ifdef DBG     
     if (sf.items() > 0 && yesno_box(TR("Si desidera eliminare i messaggi processati?")))
 #endif
     test_delete();
+		if (sf.items() == 0)
     fill_messages();
-    if (!field(F_TIMER).empty())
-    {
       if (sf.items() > 0)
         save_all_lines();
-    }
   }
   else
     NFCHECK("Can't save locked mail");