Reconciling new Gmail software with email marketing