diff --git a/app/src/main/java/eu/faircode/email/EntityIdentity.java b/app/src/main/java/eu/faircode/email/EntityIdentity.java
index 19d82c16d7..ea2d5db589 100644
--- a/app/src/main/java/eu/faircode/email/EntityIdentity.java
+++ b/app/src/main/java/eu/faircode/email/EntityIdentity.java
@@ -192,6 +192,6 @@ public class EntityIdentity {
     @NonNull
     @Override
     public String toString() {
-        return getDisplayName() + (primary ? " ★" : "");
+        return getDisplayName() + " <" + email + ">" + (primary ? " ★" : "");
     }
 }
diff --git a/app/src/main/java/eu/faircode/email/FragmentRule.java b/app/src/main/java/eu/faircode/email/FragmentRule.java
index 93d45a12fe..fb1ff94da2 100644
--- a/app/src/main/java/eu/faircode/email/FragmentRule.java
+++ b/app/src/main/java/eu/faircode/email/FragmentRule.java
@@ -48,6 +48,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Group;
+import androidx.fragment.app.FragmentTransaction;
 
 public class FragmentRule extends FragmentBase {
     private ViewGroup view;
@@ -270,7 +271,13 @@ public class FragmentRule extends FragmentBase {
                             etHeader.setText(jheader == null ? null : jheader.getString("value"));
                             cbHeader.setChecked(jheader != null && jheader.getBoolean("regex"));
 
-                            if (rule != null) {
+                            if (rule == null) {
+                                for (int pos = 0; pos < adapterIdentity.getCount(); pos++)
+                                    if (adapterIdentity.getItem(pos).primary) {
+                                        spIdent.setSelection(pos);
+                                        break;
+                                    }
+                            } else {
                                 int type = jaction.getInt("type");
                                 switch (type) {
                                     case EntityRule.TYPE_MOVE:
@@ -376,6 +383,13 @@ public class FragmentRule extends FragmentBase {
     }
 
     private void onActionSave() {
+        if (!Helper.isPro(getContext())) {
+            FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
+            fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro");
+            fragmentTransaction.commit();
+            return;
+        }
+
         try {
             Helper.setViewsEnabled(view, false);
 
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 281abc781c..7be01bbb99 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -2615,7 +2615,7 @@ public class ServiceSynchronize extends LifecycleService {
             db.folder().setFolderKeywords(folder.id, DB.Converters.fromStringArray(fkeywords.toArray(new String[0])));
         }
 
-        if (filter)
+        if (filter && Helper.isPro(context))
             try {
                 for (EntityRule rule : rules)
                     if (rule.matches(context, message, imessage)) {