Same emails appearing multiple time after upgrade to version 2.33