[BUGFIX] Fixes a bug with the mailing