[FIX]No auto delete mail

Merged Gastón Bertolani requested to merge 12.0-no-auto-delete into 12.0-stage

Merge request reports