updated FAQ

FAQ.md

@@ -3063,6 +3063,7 @@ $user$ is the user name of the 'from' email address,
 and $domain$ is the domain name of the 'from' email address: *user@domain*.
 
 $extra$ is the part after the plus sign if the username: *user+extra@example.org*.
+The 'to' user, extra and domain placeholders apply to the 'to' email address and the other placeholders apply to 'from' email address.
 
 $group$ will be replaced with the contact group name of the sender, provided that the related contact is assigned to one contact group only.
 Note that the Android contact provider isn't very fast, so using this placeholder can slow down fetching messages.

app/src/main/java/eu/faircode/email/EntityRule.java

@@ -977,6 +977,11 @@ public class EntityRule {
             String name = folder.name + (folder.separator == null ? "" : folder.separator) + create;
             EntityFolder created = db.folder().getFolderByName(folder.account, name);
             if (created == null) {
+                EntityLog.log(context, "Creating folder=" + name +
+                        " parent=" + folder.name +
+                        " separator=" + folder.separator +
+                        " pattern=" + jargs.optString("create"));
+
                 created = new EntityFolder();
                 created.tbc = true;
                 created.account = folder.account;

app/src/main/java/eu/faircode/email/UriHelper.java

@@ -195,7 +195,11 @@ public class UriHelper {
         if (plus < 0)
             return null;
 
-        return email.substring(plus + 1);
+        int at = email.indexOf('@', plus + 1);
+        if (at < 0)
+            return null;
+
+        return email.substring(plus + 1, at);
     }
 
     static String getEmailDomain(String address) {

index.html

@@ -1692,7 +1692,7 @@ $extra:to$ (since version 1.2289)
 $domain:to$ (since version 1.2289)
 $group$ (since version 1.2030)</code></pre>
 <p><span class="math inline"><em>u</em><em>s</em><em>e</em><em>r</em></span> is the user name of the ‘from’ email address, and <span class="math inline"><em>d</em><em>o</em><em>m</em><em>a</em><em>i</em><em>n</em></span> is the domain name of the ‘from’ email address: <em>user@domain</em>.</p>
-<p><span class="math inline"><em>e</em><em>x</em><em>t</em><em>r</em><em>a</em></span> is the part after the plus sign if the username: <em>user+extra@example.org</em>.</p>
+<p><span class="math inline"><em>e</em><em>x</em><em>t</em><em>r</em><em>a</em></span> is the part after the plus sign if the username: <em>user+extra@example.org</em>. The ‘to’ user, extra and domain placeholders apply to the ‘to’ email address and the other placeholders apply to ‘from’ email address.</p>
 <p><span class="math inline"><em>g</em><em>r</em><em>o</em><em>u</em><em>p</em></span> will be replaced with the contact group name of the sender, provided that the related contact is assigned to one contact group only. Note that the Android contact provider isn’t very fast, so using this placeholder can slow down fetching messages.</p>
 <p><br /></p>
 <p>Since version 1.2132 it is possible to use the following placeholders in keywords:</p>