Bug 719417 - Remove em-filter-i18n.h

Remove this old hack and translate the pre-defined filter/search/vfolder
rules the same way any other XML file gets translated.

6 files changed, 491 insertions, 573 deletions

diff --git a/mail/Makefile.am b/mail/Makefile.am
index 8a011df8f1..edde57b0ac 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -228,8 +228,6 @@ libevolution_mail_la_LIBADD =				\
 
 libevolution_mail_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
-libevolution_mail_la_DEPENDENCIES = em-filter-i18n.h
-
 noinst_PROGRAMS = test-mail-autoconfig
 
 test_mail_autoconfig_CPPFLAGS = \
@@ -249,19 +247,20 @@ test_mail_autoconfig_LDADD = \
 
 # Misc data to install
 filterdir = $(privdatadir)
-filter_DATA = filtertypes.xml vfoldertypes.xml searchtypes.xml
+filter_in_files = \
+	filtertypes.xml.in \
+	searchtypes.xml.in \
+	vfoldertypes.xml.in \
+	$(NULL)
+filter_DATA = $(filter_in_files:.xml.in=.xml)
+
+@INTLTOOL_XML_RULE@
 
 error_DATA = mail.error
 errordir = $(privdatadir)/errors
 # provides error rules too
 @EVO_PLUGIN_RULE@
 
-em-filter-i18n.h: filtertypes.xml vfoldertypes.xml searchtypes.xml
-	echo "/* Automatically generated. Do not edit. */" > $@;	      \
-	cat $(srcdir)/filtertypes.xml $(srcdir)/vfoldertypes.xml $(srcdir)/searchtypes.xml |	      \
-		sed -n -e 's:.*<title>\(.*\)</title>:gchar *s = N_("\1");:p' | \
-		sort -u >> $@
-
 ui_DATA = mail-config.ui mail-dialogs.ui
 
 etspec_DATA = message-list.etspec
@@ -272,10 +271,8 @@ EXTRA_DIST = 				\
 	$(ui_DATA)			\
 	$(server_in_files)		\
 	$(etspec_DATA)			\
-	filtertypes.xml			\
-	vfoldertypes.xml		\
-	searchtypes.xml			\
-	em-filter-i18n.h
+	$(filter_in_files)		\
+	$(NULL)
 
 # Purify support
 
@@ -295,7 +292,7 @@ endif
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
 
-BUILT_SOURCES = $(ENUM_GENERATED) $(error_DATA)
+BUILT_SOURCES = $(ENUM_GENERATED) $(error_DATA) $(filter_DATA)
 
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/mail/em-filter-i18n.h b/mail/em-filter-i18n.h
deleted file mode 100644
index 3ef519fba2..0000000000
--- a/mail/em-filter-i18n.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Automatically generated. Do not edit. */
-gchar *s = N_("Adjust Score");
-gchar *s = N_("Any header");
-gchar *s = N_("Assign Color");
-gchar *s = N_("Assign Score");
-gchar *s = N_("Attachments");
-gchar *s = N_("BCC");
-gchar *s = N_("Beep");
-gchar *s = N_("CC");
-gchar *s = N_("Completed On");
-gchar *s = N_("Copy to Folder");
-gchar *s = N_("Date received");
-gchar *s = N_("Date sent");
-gchar *s = N_("Delete");
-gchar *s = N_("Deleted");
-gchar *s = N_("Do Not Exist");
-gchar *s = N_("Draft");
-gchar *s = N_("Exist");
-gchar *s = N_("Expression");
-gchar *s = N_("Follow Up");
-gchar *s = N_("Forward to");
-gchar *s = N_("Important");
-gchar *s = N_("Junk Test");
-gchar *s = N_("Junk");
-gchar *s = N_("Label");
-gchar *s = N_("Mailing list");
-gchar *s = N_("Match All");
-gchar *s = N_("Message Body");
-gchar *s = N_("Message Header");
-gchar *s = N_("Message Location");
-gchar *s = N_("Message is Junk");
-gchar *s = N_("Message is not Junk");
-gchar *s = N_("Move to Folder");
-gchar *s = N_("Pipe to Program");
-gchar *s = N_("Play Sound");
-gchar *s = N_("Read");
-gchar *s = N_("Recipients");
-gchar *s = N_("Regex Match");
-gchar *s = N_("Replied to");
-gchar *s = N_("Run Program");
-gchar *s = N_("Score");
-gchar *s = N_("Sender or Recipients");
-gchar *s = N_("Sender");
-gchar *s = N_("Set Label");
-gchar *s = N_("Set Status");
-gchar *s = N_("Size (kB)");
-gchar *s = N_("Source Account");
-gchar *s = N_("Specific header");
-gchar *s = N_("Status");
-gchar *s = N_("Stop Processing");
-gchar *s = N_("Subject");
-gchar *s = N_("To");
-gchar *s = N_("Unset Color");
-gchar *s = N_("Unset Status");
-gchar *s = N_("contains");
-gchar *s = N_("does not contain");
-gchar *s = N_("does not end with");
-gchar *s = N_("does not exist");
-gchar *s = N_("does not have words");
-gchar *s = N_("does not return");
-gchar *s = N_("does not sound like");
-gchar *s = N_("does not start with");
-gchar *s = N_("ends with");
-gchar *s = N_("exists");
-gchar *s = N_("has words");
-gchar *s = N_("is Flagged");
-gchar *s = N_("is after");
-gchar *s = N_("is before");
-gchar *s = N_("is greater than");
-gchar *s = N_("is less than");
-gchar *s = N_("is not Flagged");
-gchar *s = N_("is not set");
-gchar *s = N_("is not");
-gchar *s = N_("is set");
-gchar *s = N_("is");
-gchar *s = N_("returns greater than");
-gchar *s = N_("returns less than");
-gchar *s = N_("returns");
-gchar *s = N_("sounds like");
-gchar *s = N_("starts with");
diff --git a/mail/filtertypes.xml b/mail/filtertypes.xml.in
index f739b06b32..930db5768e 100644
--- a/mail/filtertypes.xml
+++ b/mail/filtertypes.xml.in
@@ -2,64 +2,64 @@
 <filterdescription>
 <partset>
  <part name="sender">
-   <title>Sender</title>
+   <_title>Sender</_title>
    <input type="optionlist" name="sender-type">
     <option value="contains">
-     <title>contains</title>
+     <_title>contains</_title>
      <code>
         (match-all (header-contains "From" ${sender}))
      </code>
     </option>
     <option value="not contains">
-     <title>does not contain</title>
+     <_title>does not contain</_title>
      <code>
         (match-all (not (header-contains "From" ${sender})))
      </code>
     </option>
     <option value="is">
-     <title>is</title>
+     <_title>is</_title>
      <code>
         (match-all (header-matches "From" ${sender}))
      </code>
     </option>
     <option value="is not">
-     <title>is not</title>
+     <_title>is not</_title>
      <code>
         (match-all (not (header-matches "From" ${sender})))
      </code>
     </option>
     <option value="starts with">
-     <title>starts with</title>
+     <_title>starts with</_title>
      <code>
         (match-all (header-starts-with "From" ${sender}))
      </code>
     </option>
     <option value="not starts with">
-     <title>does not start with</title>
+     <_title>does not start with</_title>
      <code>
         (match-all (not (header-starts-with "From" ${sender})))
      </code>
     </option>
     <option value="ends with">
-     <title>ends with</title>
+     <_title>ends with</_title>
      <code>
         (match-all (header-ends-with "From" ${sender}))
      </code>
     </option>
     <option value="not ends with">
-     <title>does not end with</title>
+     <_title>does not end with</_title>
      <code>
         (match-all (not (header-ends-with "From" ${sender})))
      </code>
     </option>
     <option value="matches soundex">
-     <title>sounds like</title>
+     <_title>sounds like</_title>
      <code>
         (match-all (header-soundex "From" ${sender}))
      </code>
     </option>
     <option value="not match soundex">
-     <title>does not sound like</title>
+     <_title>does not sound like</_title>
      <code>
         (match-all (not (header-soundex "From" ${sender})))
      </code>
@@ -69,17 +69,17 @@
  </part>
 
  <part name="to">
-   <title>Recipients</title>
+   <_title>Recipients</_title>
    <input type="optionlist" name="recipient-type">
     <option value="contains">
-     <title>contains</title>
+     <_title>contains</_title>
      <code>
 	(match-all (or (header-contains "To" ${recipient})
 	    	       (header-contains "Cc" ${recipient})))
      </code>
     </option>
     <option value="not contains">
-     <title>does not contain</title>
+     <_title>does not contain</_title>
      <code>
 	(match-all (not (or
                (header-contains "To" ${recipient})
@@ -87,14 +87,14 @@
      </code>
     </option>
     <option value="is">
-     <title>is</title>
+     <_title>is</_title>
      <code>
 	(match-all (or (header-matches "To" ${recipient})
 	    	       (header-matches "Cc" ${recipient})))
      </code>
     </option>
     <option value="is not">
-     <title>is not</title>
+     <_title>is not</_title>
      <code>
 	(match-all (not (or
                (header-matches "To" ${recipient})
@@ -102,14 +102,14 @@
      </code>
     </option>
     <option value="starts with">
-     <title>starts with</title>
+     <_title>starts with</_title>
      <code>
         (match-all (or (header-starts-with "To" ${recipient})
 	    	       (header-starts-with "Cc" ${recipient})))
      </code>
     </option>
     <option value="not starts with">
-     <title>does not start with</title>
+     <_title>does not start with</_title>
      <code>
         (match-all (not (or
                (header-starts-with "To" ${recipient})
@@ -117,14 +117,14 @@
      </code>
     </option>
     <option value="ends with">
-     <title>ends with</title>
+     <_title>ends with</_title>
      <code>
         (match-all (or (header-ends-with "To" ${recipient})
 	    	       (header-ends-with "Cc" ${recipient})))
      </code>
     </option>
     <option value="not ends with">
-     <title>does not end with</title>
+     <_title>does not end with</_title>
      <code>
         (match-all (not (or
                (header-ends-with "To" ${recipient})
@@ -132,14 +132,14 @@
      </code>
     </option>
     <option value="matches soundex">
-     <title>sounds like</title>
+     <_title>sounds like</_title>
      <code>
 	(match-all (or (header-soundex "To" ${recipient})
 	    	       (header-soundex "Cc" ${recipient})))
      </code>
     </option>
     <option value="not match soundex">
-     <title>does not sound like</title>
+     <_title>does not sound like</_title>
      <code>
 	(match-all (not (or
                (header-soundex "To" ${recipient})
@@ -151,64 +151,64 @@
  </part>
 
  <part name="cc">
-   <title>CC</title>
+   <_title>CC</_title>
    <input type="optionlist" name="recipient-type">
     <option value="contains">
-     <title>contains</title>
+     <_title>contains</_title>
      <code>
 	(match-all (header-contains "Cc" ${recipient}))
      </code>
     </option>
     <option value="not contains">
-     <title>does not contain</title>
+     <_title>does not contain</_title>
      <code>
 	(match-all (not (header-contains "Cc" ${recipient})))
      </code>
     </option>
     <option value="is">
-     <title>is</title>
+     <_title>is</_title>
      <code>
 	(match-all (header-matches "Cc" ${recipient}))
      </code>
     </option>
     <option value="is not">
-     <title>is not</title>
+     <_title>is not</_title>
      <code>
 	(match-all (not (header-matches "Cc" ${recipient})))
      </code>
     </option>
     <option value="starts with">
-     <title>starts with</title>
+     <_title>starts with</_title>
      <code>
         (match-all (header-starts-with "Cc" ${recipient}))
      </code>
     </option>
     <option value="not starts with">
-     <title>does not start with</title>
+     <_title>does not start with</_title>
      <code>
         (match-all (not (header-starts-with "Cc" ${recipient})))
      </code>
     </option>
     <option value="ends with">
-     <title>ends with</title>
+     <_title>ends with</_title>
      <code>
         (match-all (header-ends-with "Cc" ${recipient}))
      </code>
     </option>
     <option value="not ends with">
-     <title>does not end with</title>
+     <_title>does not end with</_title>
      <code>
         (match-all (not (header-ends-with "Cc" ${recipient})))
      </code>
     </option>
     <option value="matches soundex">
-     <title>sounds like</title>
+     <_title>sounds like</_title>
      <code>
 	(match-all (header-soundex "Cc" ${recipient}))
      </code>
     </option>
     <option value="not match soundex">
-     <title>does not sound like</title>
+     <_title>does not sound like</_title>
      <code>
 	(match-all (not (header-soundex "Cc" ${recipient})))
      </code>
@@ -218,64 +218,64 @@
  </part>
 
  <part name="bcc">
-   <title>BCC</title>
+   <_title>BCC</_title>
    <input type="optionlist" name="recipient-type">
     <option value="contains">
-     <title>contains</title>
+     <_title>contains</_title>
      <code>
 	(match-all (header-contains "Bcc" ${recipient}))
      </code>
     </option>
     <option value="not contains">
-     <title>does not contain</title>
+     <_title>does not contain</_title>
      <code>
 	(match-all (not (header-contains "Bcc" ${recipient})))
      </code>
     </option>
     <option value="is">
-     <title>is</title>
+     <_title>is</_title>
      <code>
 	(match-all (header-matches "Bcc" ${recipient}))
      </code>
     </option>
     <option value="is not">
-     <title>is not</title>
+     <_title>is not</_title>
      <code>
 	(match-all (not (header-matches "Bcc" ${recipient})))
      </code>
     </option>
     <option value="starts with">
-     <title>starts with</title>
+     <_title>starts with</_title>
      <code>
         (match-all (header-starts-with "Bcc" ${recipient}))
      </code>
     </option>
     <option value="not starts with">
-     <title>does not start with</title>
+     <_title>does not start with</_title>
      <code>
         (match-all (not (header-starts-with "Bcc" ${recipient})))
      </code>
     </option>
     <option value="ends with">
-     <title>ends with</title>
+     <_title>ends with</_title>
      <code>
         (match-all (header-ends-with "Bcc" ${recipient}))
      </code>
     </option>
     <option value="not ends with">
-     <title>does not end with</title>
+     <_title>does not end with</_title>
      <code>
         (match-all (not (header-ends-with "Bcc" ${recipient})))
      </code>
     </option>
     <option value="matches soundex">
-     <title>sounds like</title>
+     <_title>sounds like</_title>
      <code>
 	(match-all (header-soundex "Bcc" ${recipient}))
      </code>
     </option>
     <option value="not match soundex">
-     <title>does not sound like</title>
+     <_title>does not sound like</_title>
      <code>
 	(match-all (not (header-soundex "Bcc" ${recipient})))
      </code>
@@ -285,10 +285,10 @@
  </part>
 
  <part name="senderto">
-   <title>Sender or Recipients</title>
+   <_title>Sender or Recipients</_title>
    <input type="optionlist" name="recipient-type">
     <option value="contains">
-     <title>contains</title>
+     <_title>contains</_title>
      <code>
 	(match-all (or (header-contains "From" ${recipient})
 	    	       (header-contains "To" ${recipient})
@@ -297,7 +297,7 @@
      </code>
     </option>
     <option value="not contains">
-     <title>does not contain</title>
+     <_title>does not contain</_title>
      <code>
 	(match-all (not (or
                (header-contains "From" ${recipient})
@@ -307,7 +307,7 @@
      </code>
     </option>
     <option value="is">
-     <title>is</title>
+     <_title>is</_title>
      <code>
 	(match-all (or (header-matches "From" ${recipient})
 	    	       (header-matches "To" ${recipient})
@@ -316,7 +316,7 @@
      </code>
     </option>
     <option value="is not">
-     <title>is not</title>
+     <_title>is not</_title>
      <code>
 	(match-all (not (or
                (header-matches "From" ${recipient})
@@ -326,7 +326,7 @@
      </code>
     </option>
     <option value="starts with">
-     <title>starts with</title>
+     <_title>starts with</_title>
      <code>
         (match-all (or (header-starts-with "From" ${recipient})
 	    	       (header-starts-with "To" ${recipient})
@@ -335,7 +335,7 @@
      </code>
     </option>
     <option value="not starts with">
-     <title>does not start with</title>
+     <_title>does not start with</_title>
      <code>
         (match-all (not (or
                (header-starts-with "From" ${recipient})
@@ -345,7 +345,7 @@
      </code>
     </option>
     <option value="ends with">
-     <title>ends with</title>
+     <_title>ends with</_title>
      <code>
         (match-all (or (header-ends-with "From" ${recipient})
 	    	       (header-ends-with "To" ${recipient})
@@ -354,7 +354,7 @@
      </code>
     </option>
     <option value="not ends with">
-     <title>does not end with</title>
+     <_title>does not end with</_title>
      <code>
         (match-all (not (or
                (header-ends-with "From" ${recipient})
@@ -364,7 +364,7 @@
      </code>
     </option>
     <option value="matches soundex">
-     <title>sounds like</title>
+     <_title>sounds like</_title>
      <code>
 	(match-all (or (header-soundex "From" ${recipient})
 	    	       (header-soundex "To" ${recipient})
@@ -373,7 +373,7 @@
      </code>
     </option>
     <option value="not match soundex">
-     <title>does not sound like</title>
+     <_title>does not sound like</_title>
      <code>
 	(match-all (not (or
                (header-soundex "From" ${recipient})
@@ -387,76 +387,76 @@
  </part>
 
  <part name="subject">
-   <title>Subject</title>
+   <_title>Subject</_title>
    <input type="optionlist" name="subject-type">
     <option value="contains">
-     <title>contains</title>
+     <_title>contains</_title>
      <code>
 	(match-all (header-contains "Subject" ${subject}))
      </code>
     </option>
     <option value="not contains">
-     <title>does not contain</title>
+     <_title>does not contain</_title>
      <code>
 	(match-all (not (header-contains "Subject" ${subject})))
      </code>
     </option>
     <option value="has-words">
-     <title>has words</title>
+     <_title>has words</_title>
      <code>
 	(match-all (header-has-words "Subject" ${subject}))
      </code>
     </option>
     <option value="not has-words">
-     <title>does not have words</title>
+     <_title>does not have words</_title>
      <code>
 	(match-all (not (header-has-words "Subject" ${subject})))
      </code>
     </option>
     <option value="is">
-     <title>is</title>
+     <_title>is</_title>
      <code>
 	(match-all (header-matches "Subject" ${subject}))
      </code>
     </option>
     <option value="is not">
-     <title>is not</title>
+     <_title>is not</_title>
      <code>
 	(match-all (not (header-matches "Subject" ${subject})))
      </code>
     </option>
     <option value="starts with">
-     <title>starts with</title>
+     <_title>starts with</_title>
      <code>
 	(match-all (header-starts-with "Subject" ${subject}))
      </code>
     </option>
     <option value="not starts with">
-     <title>does not start with</title>
+     <_title>does not start with</_title>
      <code>
 	(match-all (not (header-starts-with "Subject" ${subject})))
      </code>
     </option>
     <option value="ends with">
-     <title>ends with</title>
+     <_title>ends with</_title>
      <code>
 	(match-all (header-ends-with "Subject" ${subject}))
      </code>
     </option>
     <option value="not ends with">
-     <title>does not end with</title>
+     <_title>does not end with</_title>
      <code>
 	(match-all (not (header-ends-with "Subject" ${subject})))
      </code>
     </option>
     <option value="matches soundex">
-     <title>sounds like</title>
+     <_title>sounds like</_title>
      <code>
         (match-all (header-soundex "Subject" ${subject}))
      </code>
     </option>
     <option value="not match soundex">
-     <title>does not sound like</title>
+     <_title>does not sound like</_title>
      <code>
         (match-all (not (header-soundex "Subject" ${subject})))
      </code>
@@ -466,89 +466,89 @@
  </part>
 
  <part name="header">
-   <title>Specific header</title>
+   <_title>Specific header</_title>
    <input type="string" name="header-field" allow-empty="false"/>
    <input type="optionlist" name="header-type">
     <option value="contains">
-     <title>contains</title>
+     <_title>contains</_title>
      <code>
 	(match-all (header-contains ${header-field} ${word}))
      </code>
     </option>
     <option value="not contains">
-     <title>does not contain</title>
+     <_title>does not contain</_title>
      <code>
 	(match-all (not (header-contains ${header-field} ${word})))
      </code>
     </option>
     <option value="has-words">
-     <title>has words</title>
+     <_title>has words</_title>
      <code>
 	(match-all (header-has-words ${header-field} ${word}))
      </code>
     </option>
     <option value="not has-words">
-     <title>does not have words</title>
+     <_title>does not have words</_title>
      <code>
 	(match-all (not (header-has-words ${header-field} ${word})))
      </code>
     </option>
     <option value="is">
-     <title>is</title>
+     <_title>is</_title>
      <code>
 	(match-all (header-matches ${header-field} ${word}))
      </code>
     </option>
     <option value="is not">
-     <title>is not</title>
+     <_title>is not</_title>
      <code>
 	(match-all (not (header-matches ${header-field} ${word})))
      </code>
     </option>
     <option value="starts with">
-     <title>starts with</title>
+     <_title>starts with</_title>
      <code>
 	(match-all (header-starts-with ${header-field} ${word}))
      </code>
     </option>
     <option value="not starts with">
-     <title>does not start with</title>
+     <_title>does not start with</_title>
      <code>
 	(match-all (not (header-starts-with ${header-field} ${word})))
      </code>
     </option>
     <option value="ends with">
-     <title>ends with</title>
+     <_title>ends with</_title>
      <code>
 	(match-all (header-ends-with ${header-field} ${word}))
      </code>
     </option>
     <option value="not ends with">
-     <title>does not end with</title>
+     <_title>does not end with</_title>
      <code>
 	(match-all (not (header-ends-with ${header-field} ${word})))
      </code>
     </option>
     <option value="exists">
-     <title>exists</title>
+     <_title>exists</_title>
      <code>
 	(match-all (header-exists ${header-field}))
      </code>
     </option>
     <option value="not exists">
-     <title>does not exist</title>
+     <_title>does not exist</_title>
      <code>
 	(match-all (not (header-exists ${header-field})))
      </code>
     </option>
     <option value="matches soundex">
-     <title>sounds like</title>
+     <_title>sounds like</_title>
      <code>
         (match-all (header-soundex ${header-field} ${word}))
      </code>
     </option>
     <option value="not match soundex">
-     <title>does not sound like</title>
+     <_title>does not sound like</_title>
      <code>
         (match-all (not (header-soundex ${header-field} ${word})))
      </code>
@@ -558,16 +558,16 @@
  </part>
 
  <part name="body">
-   <title>Message Body</title>
+   <_title>Message Body</_title>
    <input type="optionlist" name="body-type">
     <option value="contains">
-     <title>contains</title>
+     <_title>contains</_title>
      <code>
 	(body-contains ${word})
      </code>
     </option>
     <option value="not contains">
-     <title>does not contain</title>
+     <_title>does not contain</_title>
      <code>
 	(match-all (not (body-contains ${word})))
      </code>
@@ -577,33 +577,33 @@
  </part>
 
  <part name="sexp">
-   <title>Expression</title>
+   <_title>Expression</_title>
    <input type="code" name="code"/>
  </part>
 
  <part name="sent-date">
-  <title>Date sent</title>
+  <_title>Date sent</_title>
   <input type="optionlist" name="date-spec-type">
    <option value="is">
-    <title>is</title>
+    <_title>is</_title>
     <code>
        (match-all (= (get-sent-date) ${versus}))
     </code>
    </option>
    <option value="is-not">
-    <title>is not</title>
+    <_title>is not</_title>
     <code>
        (match-all (not (= (get-sent-date) ${versus})))
     </code>
    </option>
    <option value="before">
-    <title>is before</title>
+    <_title>is before</_title>
     <code>
        (match-all (&lt; (get-sent-date) ${versus}))
     </code>
    </option>
    <option value="after">
-    <title>is after</title>
+    <_title>is after</_title>
     <code>
        (match-all (&gt; (get-sent-date) ${versus}))
     </code>
@@ -613,28 +613,28 @@
  </part>
 
  <part name="recv-date">
-  <title>Date received</title>
+  <_title>Date received</_title>
   <input type="optionlist" name="date-spec-type">
    <option value="is">
-    <title>is</title>
+    <_title>is</_title>
     <code>
        (match-all (= (get-received-date) ${versus}))
     </code>
    </option>
    <option value="is-not">
-    <title>is not</title>
+    <_title>is not</_title>
     <code>
        (match-all (not (= (get-received-date) ${versus})))
     </code>
    </option>
    <option value="before">
-    <title>is before</title>
+    <_title>is before</_title>
     <code>
        (match-all (&lt; (get-received-date) ${versus}))
     </code>
    </option>
    <option value="after">
-    <title>is after</title>
+    <_title>is after</_title>
     <code>
        (match-all (&gt; (get-received-date) ${versus}))
     </code>
@@ -644,14 +644,14 @@
  </part>
 
  <part name="label">
-  <title>Label</title>
+  <_title>Label</_title>
   <input type="optionlist" name="label-type">
    <option value="is">
-    <title>is</title>
+    <_title>is</_title>
     <code func="e_mail_labels_get_filter_code"/>
    </option>
    <option value="is-not">
-    <title>is not</title>
+    <_title>is not</_title>
     <code func="e_mail_labels_get_filter_code"/>
    </option>
   </input>
@@ -661,28 +661,28 @@
  </part>
 
  <part name="score">
-  <title>Score</title>
+  <_title>Score</_title>
   <input type="optionlist" name="score-type">
    <option value="is">
-    <title>is</title>
+    <_title>is</_title>
     <code>
        (match-all (= (cast-int (user-tag "score")) ${versus}))
     </code>
    </option>
    <option value="is-not">
-    <title>is not</title>
+    <_title>is not</_title>
     <code>
        (match-all (not (= (cast-int (user-tag "score")) ${versus})))
     </code>
    </option>
    <option value="greater-than">
-    <title>is greater than</title>
+    <_title>is greater than</_title>
     <code>
        (match-all (&gt; (cast-int (user-tag "score")) ${versus}))
     </code>
    </option>
    <option value="less-than">
-    <title>is less than</title>
+    <_title>is less than</_title>
     <code>
        (match-all (&lt; (cast-int (user-tag "score")) ${versus}))
     </code>
@@ -692,16 +692,16 @@
  </part>
 
  <part name="size">
-  <title>Size (kB)</title>
+  <_title>Size (kB)</_title>
   <input type="optionlist" name="size-type">
    <option value="greater-than">
-    <title>is greater than</title>
+    <_title>is greater than</_title>
     <code>
        (match-all (&gt; (get-size) ${versus}))
     </code>
    </option>
    <option value="less-than">
-    <title>is less than</title>
+    <_title>is less than</_title>
     <code>
        (match-all (&lt; (get-size) ${versus}))
     </code>
@@ -711,16 +711,16 @@
  </part>
 
  <part name="status">
-  <title>Status</title>
+  <_title>Status</_title>
   <input type="optionlist" name="match-type">
    <option value="is">
-    <title>is</title>
+    <_title>is</_title>
     <code>
      (match-all (system-flag ${flag}))
     </code>
    </option>
    <option value="is not">
-    <title>is not</title>
+    <_title>is not</_title>
     <code>
      (match-all (not (system-flag ${flag})))
     </code>
@@ -728,34 +728,34 @@
   </input>
   <input type="optionlist" name="flag">
    <option value="Answered">
-    <title>Replied to</title>
+    <_title>Replied to</_title>
    </option>
    <option value="Draft">
-    <title>Draft</title>
+    <_title>Draft</_title>
    </option>
    <option value="Flagged">
-    <title>Important</title>
+    <_title>Important</_title>
    </option>
    <option value="Seen">
-    <title>Read</title>
+    <_title>Read</_title>
    </option>
    <option value="Junk">
-    <title>Junk</title>
+    <_title>Junk</_title>
    </option>
   </input>
  </part>
 
  <part name="follow-up">
-  <title>Follow Up</title>
+  <_title>Follow Up</_title>
   <input type="optionlist" name="match-type">
    <option value="is">
-    <title>is Flagged</title>
+    <_title>is Flagged</_title>
     <code>
      (match-all (not (= (user-tag "follow-up") "")))
     </code>
    </option>
    <option value="is not">
-    <title>is not Flagged</title>
+    <_title>is not Flagged</_title>
     <code>
      (match-all (= (user-tag "follow-up") ""))
     </code>
@@ -764,16 +764,16 @@
  </part>
 
  <part name="completed-on">
-  <title>Completed On</title>
+  <_title>Completed On</_title>
   <input type="optionlist" name="date-spec-type">
    <option value="is set">
-    <title>is set</title>
+    <_title>is set</_title>
     <code>
        (match-all (not (= (user-tag "completed-on") "")))
     </code>
    </option>
    <option value="is not set">
-    <title>is not set</title>
+    <_title>is not set</_title>
     <code>
        (match-all (= (user-tag "completed-on") ""))
     </code>
@@ -782,16 +782,16 @@
  </part>
 
  <part name="attachments">
-  <title>Attachments</title>
+  <_title>Attachments</_title>
   <input type="optionlist" name="match-type">
    <option value="exist">
-    <title>Exist</title>
+    <_title>Exist</_title>
     <code>
      (match-all (system-flag "Attachments"))
     </code>
    </option>
    <option value="not exist">
-    <title>Do Not Exist</title>
+    <_title>Do Not Exist</_title>
     <code>
      (match-all (not (system-flag "Attachments")))
     </code>
@@ -800,22 +800,22 @@
  </part>
 
  <part name="mlist">
-  <title>Mailing list</title>
+  <_title>Mailing list</_title>
    <input type="optionlist" name="mlist-type">
     <option value="is">
-        <title>is</title>
+        <_title>is</_title>
         <code>(match-all (header-matches "x-camel-mlist" ${mlist}))</code>
     </option>
     <option value="is not">
-        <title>is not</title>
+        <_title>is not</_title>
         <code>(match-all (not (header-matches "x-camel-mlist" ${mlist})))</code>
     </option>
     <option value="contains">
-        <title>contains</title>
+        <_title>contains</_title>
         <code>(match-all (header-contains "x-camel-mlist" ${mlist}))</code>
     </option>
     <option value="not contains">
-        <title>does not contain</title>
+        <_title>does not contain</_title>
         <code>(match-all (not (header-contains "x-camel-mlist" ${mlist})))</code>
     </option>
    </input>
@@ -823,16 +823,16 @@
  </part>
 
  <part name="regex">
-  <title>Regex Match</title>
+  <_title>Regex Match</_title>
   <input type="optionlist" name="match-type">
    <option value="header">
-    <title>Message Header</title>
+    <_title>Message Header</_title>
     <code>
        (match-all (header-full-regex ${expression}))
     </code>
    </option>
    <option value="body">
-    <title>Message Body</title>
+    <_title>Message Body</_title>
     <code>
        (match-all (body-regex ${expression}))
     </code>
@@ -842,16 +842,16 @@
  </part>
 
  <part name="source">
-  <title>Source Account</title>
+  <_title>Source Account</_title>
   <input type="optionlist" name="srcmatch-type">
    <option value="is">
-    <title>is</title>
+    <_title>is</_title>
     <code>
       (match-all (header-source ${source}))
     </code>
    </option>
    <option value="is-not">
-    <title>is not</title>
+    <_title>is not</_title>
     <code>
       (match-all (not (header-source ${source})))
     </code>
@@ -861,29 +861,29 @@
  </part>
 
  <part name="pipe">
-  <title>Pipe to Program</title>
+  <_title>Pipe to Program</_title>
   <input type="command" name="command"/>
   <input type="optionlist" name="retval-type">
    <option value="is">
-    <title>returns</title>
+    <_title>returns</_title>
     <code>
       (match-all (= (pipe-message "/bin/sh" "-c" ${command}) ${retval}))
     </code>
    </option>
    <option value="is-not">
-    <title>does not return</title>
+    <_title>does not return</_title>
     <code>
       (match-all (not (= (pipe-message "/bin/sh" "-c" ${command}) ${retval})))
     </code>
    </option>
    <option value="greater-than">
-    <title>returns greater than</title>
+    <_title>returns greater than</_title>
     <code>
       (match-all (&gt; (pipe-message "/bin/sh" "-c" ${command}) ${retval}))
     </code>
    </option>
    <option value="less-than">
-    <title>returns less than</title>
+    <_title>returns less than</_title>
     <code>
       (match-all (&lt; (pipe-message "/bin/sh" "-c" ${command}) ${retval}))
     </code>
@@ -893,16 +893,16 @@
  </part>
 
  <part name="junk">
-  <title>Junk Test</title>
+  <_title>Junk Test</_title>
   <input type="optionlist" name="retval-type">
    <option value="is-junk">
-    <title>Message is Junk</title>
+    <_title>Message is Junk</_title>
     <code>
       (match-all (junk-test))
     </code>
    </option>
    <option value="is-not-junk">
-    <title>Message is not Junk</title>
+    <_title>Message is not Junk</_title>
     <code>
       (match-all (not (junk-test)))
     </code>
@@ -911,7 +911,7 @@
  </part>
 
     <part name="all">
-      <title>Match All</title>
+      <_title>Match All</_title>
       <code>
        (match-all #t)
       </code>
@@ -922,123 +922,123 @@
 
 <actionset>
  <part name="move-to-folder">
-  <title>Move to Folder</title>
+  <_title>Move to Folder</_title>
   <code>(move-to ${folder})</code>
   <input type="folder" name="folder"/>
  </part>
  <part name="copy-to-folder">
-  <title>Copy to Folder</title>
+  <_title>Copy to Folder</_title>
   <code>(copy-to ${folder})</code>
   <input type="folder" name="folder"/>
  </part>
  <part name="delete">
-  <title>Delete</title>
+  <_title>Delete</_title>
   <code>(delete)</code>
  </part>
  <part name="stop">
-  <title>Stop Processing</title>
+  <_title>Stop Processing</_title>
   <code>(stop)</code>
  </part>
  <part name="label">
-  <title>Set Label</title>
+  <_title>Set Label</_title>
   <code>(set-label ${label})</code>
   <input type="optionlist" name="label">
      <dynamic func="e_mail_labels_get_filter_options_without_none"/>
   </input>
  </part>
  <part name="colour">
-  <title>Assign Color</title>
+  <_title>Assign Color</_title>
   <code>(set-color ${colour})</code>
   <input type="colour" name="colour"/>
  </part>
  <part name="unset-color">
-  <title>Unset Color</title>
+  <_title>Unset Color</_title>
   <code>(set-color "")</code>
  </part>
  <part name="score">
-  <title>Assign Score</title>
+  <_title>Assign Score</_title>
   <code>(set-score ${score})</code>
   <input type="score" name="score"/>
  </part>
  <part name="adj-score">
-  <title>Adjust Score</title>
+  <_title>Adjust Score</_title>
   <code>(adjust-score ${score})</code>
   <input type="score" name="score"/>
  </part>
  <part name="set-status">
-  <title>Set Status</title>
+  <_title>Set Status</_title>
   <code>
    (set-system-flag ${flag})
   </code>
   <input type="optionlist" name="flag">
    <option value="Answered">
-    <title>Replied to</title>
+    <_title>Replied to</_title>
    </option>
    <option value="Deleted">
-    <title>Deleted</title>
+    <_title>Deleted</_title>
    </option>
    <option value="Draft">
-    <title>Draft</title>
+    <_title>Draft</_title>
    </option>
    <option value="Flagged">
-    <title>Important</title>
+    <_title>Important</_title>
    </option>
    <option value="Seen">
-    <title>Read</title>
+    <_title>Read</_title>
    </option>
    <option value="Junk">
-    <title>Junk</title>
+    <_title>Junk</_title>
    </option>
   </input>
  </part>
  <part name="unset-status">
-  <title>Unset Status</title>
+  <_title>Unset Status</_title>
   <code>
    (unset-system-flag ${flag})
   </code>
   <input type="optionlist" name="flag">
    <option value="Answered">
-    <title>Replied to</title>
+    <_title>Replied to</_title>
    </option>
    <option value="Deleted">
-    <title>Deleted</title>
+    <_title>Deleted</_title>
    </option>
    <option value="Draft">
-    <title>Draft</title>
+    <_title>Draft</_title>
    </option>
    <option value="Flagged">
-    <title>Important</title>
+    <_title>Important</_title>
    </option>
    <option value="Seen">
-    <title>Read</title>
+    <_title>Read</_title>
    </option>
    <option value="Junk">
-    <title>Junk</title>
+    <_title>Junk</_title>
    </option>
   </input>
  </part>
  <part name="beep">
-  <title>Beep</title>
+  <_title>Beep</_title>
   <code>(beep)</code>
  </part>
  <part name="play-sound">
-  <title>Play Sound</title>
+  <_title>Play Sound</_title>
   <code>(play-sound ${sound})</code>
   <input type="file" name="sound"/>
  </part>
  <part name="shell">
-  <title>Run Program</title>
+  <_title>Run Program</_title>
   <code>(shell "/bin/sh" "-c" ${command})</code>
   <input type="command" name="command"/>
  </part>
  <part name="pipe">
-  <title>Pipe to Program</title>
+  <_title>Pipe to Program</_title>
   <code>(pipe-message "/bin/sh" "-c" ${command})</code>
   <input type="command" name="command"/>
  </part>
 
  <part name="forward">
-  <title>Forward to</title>
+  <_title>Forward to</_title>
   <code>(forward-to ${address})</code>
   <input type="address" name="address" allow-empty="false"/>
  </part>
diff --git a/mail/searchtypes.xml b/mail/searchtypes.xml.in
index 02f84e40c0..ef116f424d 100644
--- a/mail/searchtypes.xml
+++ b/mail/searchtypes.xml.in
@@ -2,44 +2,44 @@
 <filterdescription>
 <partset>
  <part name="sender">
-  <title>Sender</title>
+  <_title>Sender</_title>
    <input type="optionlist" name="sender-type">
     <option value="contains">
-        <title>contains</title>
+        <_title>contains</_title>
        <code>(match-all (header-contains "From" ${sender}))</code>
     </option>
     <option value="not contains">
-        <title>does not contain</title>
+        <_title>does not contain</_title>
         <code>(match-all (not (header-contains "From" ${sender})))</code>
     </option>
     <option value="is">
-        <title>is</title>
+        <_title>is</_title>
        <code>(match-all (header-matches "From" ${sender}))</code>
     </option>
     <option value="is not">
-        <title>is not</title>
+        <_title>is not</_title>
         <code>(match-all (not (header-matches "From" ${sender})))</code>
     </option>
     <option value="starts with">
-     <title>starts with</title>
+     <_title>starts with</_title>
      <code>
         (match-all (header-starts-with "From" ${sender}))
      </code>
     </option>
     <option value="not starts with">
-     <title>does not start with</title>
+     <_title>does not start with</_title>
      <code>
         (match-all (not (header-starts-with "From" ${sender})))
      </code>
     </option>
     <option value="ends with">
-     <title>ends with</title>
+     <_title>ends with</_title>
      <code>
         (match-all (header-ends-with "From" ${sender}))
      </code>
     </option>
     <option value="not ends with">
-     <title>does not end with</title>
+     <_title>does not end with</_title>
      <code>
         (match-all (not (header-ends-with "From" ${sender})))
      </code>
@@ -53,17 +53,17 @@
             it kills our search performance by forcing entire messages
             to be downloaded just to examine their Bcc headers. -->
  <part name="to">
-   <title>Recipients</title>
+   <_title>Recipients</_title>
    <input type="optionlist" name="recipient-type">
     <option value="contains">
-     <title>contains</title>
+     <_title>contains</_title>
      <code>
        (match-all (or (header-contains "To" ${recipient})
                       (header-contains "Cc" ${recipient})))
      </code>
     </option>
     <option value="not contains">
-     <title>does not contain</title>
+     <_title>does not contain</_title>
      <code>
        (match-all (not (or
                           (header-contains "To" ${recipient})
@@ -71,14 +71,14 @@
      </code>
     </option>
     <option value="is">
-     <title>is</title>
+     <_title>is</_title>
      <code>
        (match-all (or (header-matches "To" ${recipient})
                          (header-matches "Cc" ${recipient})))
      </code>
     </option>
     <option value="is not">
-     <title>is not</title>
+     <_title>is not</_title>
      <code>
        (match-all (not (or
                (header-matches "To" ${recipient})
@@ -86,14 +86,14 @@
      </code>
     </option>
     <option value="starts with">
-     <title>starts with</title>
+     <_title>starts with</_title>
      <code>
         (match-all (or (header-starts-with "To" ${recipient})
                          (header-starts-with "Cc" ${recipient})))
      </code>
     </option>
     <option value="not starts with">
-     <title>does not start with</title>
+     <_title>does not start with</_title>
      <code>
         (match-all (not (or
                (header-starts-with "To" ${recipient})
@@ -101,14 +101,14 @@
      </code>
     </option>
     <option value="ends with">
-     <title>ends with</title>
+     <_title>ends with</_title>
      <code>
         (match-all (or (header-ends-with "To" ${recipient})
                          (header-ends-with "Cc" ${recipient})))
      </code>
     </option>
     <option value="not ends with">
-     <title>does not end with</title>
+     <_title>does not end with</_title>
      <code>
         (match-all (not (or
                (header-ends-with "To" ${recipient})
@@ -120,64 +120,64 @@
  </part>
 
  <part name="toonly">
-   <title>To</title>
+   <_title>To</_title>
    <input type="optionlist" name="recipient-type">
     <option value="contains">
-     <title>contains</title>
+     <_title>contains</_title>
      <code>
        (match-all (header-contains "To" ${recipient}))
      </code>
     </option>
     <option value="not contains">
-     <title>does not contain</title>
+     <_title>does not contain</_title>
      <code>
        (match-all (not (header-contains "To" ${recipient})))
      </code>
     </option>
     <option value="is">
-     <title>is</title>
+     <_title>is</_title>
      <code>
        (match-all (header-matches "To" ${recipient}))
      </code>
     </option>
     <option value="is not">
-     <title>is not</title>
+     <_title>is not</_title>
      <code>
        (match-all (not (header-matches "To" ${recipient})))
      </code>
     </option>
     <option value="starts with">
-     <title>starts with</title>
+     <_title>starts with</_title>
      <code>
         (match-all (header-starts-with "To" ${recipient}))
      </code>
     </option>
     <option value="not starts with">
-     <title>does not start with</title>
+     <_title>does not start with</_title>
      <code>
         (match-all (not (header-starts-with "To" ${recipient})))
      </code>
     </option>
     <option value="ends with">
-     <title>ends with</title>
+     <_title>ends with</_title>
      <code>
         (match-all (header-ends-with "To" ${recipient}))
      </code>
     </option>
     <option value="not ends with">
-     <title>does not end with</title>
+     <_title>does not end with</_title>
      <code>
         (match-all (not (header-ends-with "To" ${recipient})))
      </code>
     </option>
     <option value="matches soundex">
-     <title>sounds like</title>
+     <_title>sounds like</_title>
      <code>
        (match-all (header-soundex "To" ${recipient}))
      </code>
     </option>
     <option value="not match soundex">
-     <title>does not sound like</title>
+     <_title>does not sound like</_title>
      <code>
        (match-all (not (header-soundex "To" ${recipient})))
      </code>
@@ -187,64 +187,64 @@
  </part>
 
  <part name="cc">
-   <title>CC</title>
+   <_title>CC</_title>
    <input type="optionlist" name="recipient-type">
     <option value="contains">
-     <title>contains</title>
+     <_title>contains</_title>
      <code>
        (match-all (header-contains "Cc" ${recipient}))
      </code>
     </option>
     <option value="not contains">
-     <title>does not contain</title>
+     <_title>does not contain</_title>
      <code>
        (match-all (not (header-contains "Cc" ${recipient})))
      </code>
     </option>
     <option value="is">
-     <title>is</title>
+     <_title>is</_title>
      <code>
        (match-all (header-matches "Cc" ${recipient}))
      </code>
     </option>
     <option value="is not">
-     <title>is not</title>
+     <_title>is not</_title>
      <code>
        (match-all (not (header-matches "Cc" ${recipient})))
      </code>
     </option>
     <option value="starts with">
-     <title>starts with</title>
+     <_title>starts with</_title>
      <code>
         (match-all (header-starts-with "Cc" ${recipient}))
      </code>
     </option>
     <option value="not starts with">
-     <title>does not start with</title>
+     <_title>does not start with</_title>
      <code>
         (match-all (not (header-starts-with "Cc" ${recipient})))
      </code>
     </option>
     <option value="ends with">
-     <title>ends with</title>
+     <_title>ends with</_title>
      <code>
         (match-all (header-ends-with "Cc" ${recipient}))
      </code>
     </option>
     <option value="not ends with">
-     <title>does not end with</title>
+     <_title>does not end with</_title>
      <code>
         (match-all (not (header-ends-with "Cc" ${recipient})))
      </code>
     </option>
     <option value="matches soundex">
-     <title>sounds like</title>
+     <_title>sounds like</_title>
      <code>
        (match-all (header-soundex "Cc" ${recipient}))
      </code>
     </option>
     <option value="not match soundex">
-     <title>does not sound like</title>
+     <_title>does not sound like</_title>
      <code>
        (match-all (not (header-soundex "Cc" ${recipient})))
      </code>
@@ -254,64 +254,64 @@
  </part>
 
  <part name="bcc">
-   <title>BCC</title>
+   <_title>BCC</_title>
    <input type="optionlist" name="recipient-type">
     <option value="contains">
-     <title>contains</title>
+     <_title>contains</_title>
      <code>
        (match-all (header-contains "Bcc" ${recipient}))
      </code>
     </option>
     <option value="not contains">
-     <title>does not contain</title>
+     <_title>does not contain</_title>
      <code>
        (match-all (not (header-contains "Bcc" ${recipient})))
      </code>
     </option>
     <option value="is">
-     <title>is</title>
+     <_title>is</_title>
      <code>
        (match-all (header-matches "Bcc" ${recipient}))
      </code>
     </option>
     <option value="is not">
-     <title>is not</title>
+     <_title>is not</_title>
      <code>
        (match-all (not (header-matches "Bcc" ${recipient})))
      </code>
     </option>
     <option value="starts with">
-     <title>starts with</title>
+     <_title>starts with</_title>
      <code>
         (match-all (header-starts-with "Bcc" ${recipient}))
      </code>
     </option>
     <option value="not starts with">
-     <title>does not start with</title>
+     <_title>does not start with</_title>
      <code>
         (match-all (not (header-starts-with "Bcc" ${recipient})))
      </code>
     </option>
     <option value="ends with">
-     <title>ends with</title>
+     <_title>ends with</_title>
      <code>
         (match-all (header-ends-with "Bcc" ${recipient}))
      </code>
     </option>
     <option value="not ends with">
-     <title>does not end with</title>
+     <_title>does not end with</_title>
      <code>
         (match-all (not (header-ends-with "Bcc" ${recipient})))
      </code>
     </option>
     <option value="matches soundex">
-     <title>sounds like</title>
+     <_title>sounds like</_title>
      <code>
        (match-all (header-soundex "Bcc" ${recipient}))
      </code>
     </option>
     <option value="not match soundex">
-     <title>does not sound like</title>
+     <_title>does not sound like</_title>
      <code>
        (match-all (not (header-soundex "Bcc" ${recipient})))
      </code>
@@ -321,10 +321,10 @@
  </part>
 
  <part name="senderto">
-   <title>Sender or Recipients</title>
+   <_title>Sender or Recipients</_title>
    <input type="optionlist" name="recipient-type">
     <option value="contains">
-     <title>contains</title>
+     <_title>contains</_title>
      <code>
        (match-all (or (header-contains "From" ${recipient})
                       (header-contains "To" ${recipient})
@@ -332,7 +332,7 @@
      </code>
     </option>
     <option value="not contains">
-     <title>does not contain</title>
+     <_title>does not contain</_title>
      <code>
        (match-all (not (or
                           (header-contains "From" ${recipient})
@@ -341,7 +341,7 @@
      </code>
     </option>
     <option value="is">
-     <title>is</title>
+     <_title>is</_title>
      <code>
        (match-all (or (header-matches "From" ${recipient})
                          (header-matches "To" ${recipient})
@@ -349,7 +349,7 @@
      </code>
     </option>
     <option value="is not">
-     <title>is not</title>
+     <_title>is not</_title>
      <code>
        (match-all (not (or
                (header-matches "From" ${recipient})
@@ -358,7 +358,7 @@
      </code>
     </option>
     <option value="starts with">
-     <title>starts with</title>
+     <_title>starts with</_title>
      <code>
         (match-all (or (header-starts-with "From" ${recipient})
                          (header-starts-with "To" ${recipient})
@@ -366,7 +366,7 @@
      </code>
     </option>
     <option value="not starts with">
-     <title>does not start with</title>
+     <_title>does not start with</_title>
      <code>
         (match-all (not (or
                (header-starts-with "From" ${recipient})
@@ -375,7 +375,7 @@
      </code>
     </option>
     <option value="ends with">
-     <title>ends with</title>
+     <_title>ends with</_title>
      <code>
         (match-all (or (header-ends-with "From" ${recipient})
                          (header-ends-with "To" ${recipient})
@@ -383,7 +383,7 @@
      </code>
     </option>
     <option value="not ends with">
-     <title>does not end with</title>
+     <_title>does not end with</_title>
      <code>
         (match-all (not (or
                (header-ends-with "From" ${recipient})
@@ -396,64 +396,64 @@
  </part>
 
  <part name="subject">
-   <title>Subject</title>
+   <_title>Subject</_title>
    <input type="optionlist" name="subject-type">
     <option value="contains">
-     <title>contains</title>
+     <_title>contains</_title>
      <code>
        (match-all (header-contains "Subject" ${subject}))
      </code>
     </option>
     <option value="not contains">
-     <title>does not contain</title>
+     <_title>does not contain</_title>
      <code>
        (match-all (not (header-contains "Subject" ${subject})))
      </code>
     </option>
     <option value="has-words">
-     <title>has words</title>
+     <_title>has words</_title>
      <code>
 	(match-all (header-has-words "Subject" ${subject}))
      </code>
     </option>
     <option value="not has-words">
-     <title>does not have words</title>
+     <_title>does not have words</_title>
      <code>
 	(match-all (not (header-has-words "Subject" ${subject})))
      </code>
     </option>
     <option value="is">
-     <title>is</title>
+     <_title>is</_title>
      <code>
        (match-all (header-matches "Subject" ${subject}))
      </code>
     </option>
     <option value="is not">
-     <title>is not</title>
+     <_title>is not</_title>
      <code>
        (match-all (not (header-matches "Subject" ${subject})))
      </code>
     </option>
     <option value="starts with">
-     <title>starts with</title>
+     <_title>starts with</_title>
      <code>
        (match-all (header-starts-with "Subject" ${subject}))
      </code>
     </option>
     <option value="not starts with">
-     <title>does not start with</title>
+     <_title>does not start with</_title>
      <code>
        (match-all (not (header-starts-with "Subject" ${subject})))
      </code>
     </option>
     <option value="ends with">
-     <title>ends with</title>
+     <_title>ends with</_title>
      <code>
        (match-all (header-ends-with "Subject" ${subject}))
      </code>
     </option>
     <option value="not ends with">
-     <title>does not end with</title>
+     <_title>does not end with</_title>
      <code>
        (match-all (not (header-ends-with "Subject" ${subject})))
      </code>
@@ -463,89 +463,89 @@
  </part>
 
  <part name="header">
-   <title>Specific header</title>
+   <_title>Specific header</_title>
    <input type="string" name="header-field"/>
    <input type="optionlist" name="header-type">
     <option value="contains">
-     <title>contains</title>
+     <_title>contains</_title>
      <code>
        (match-all (header-contains ${header-field} ${word}))
      </code>
     </option>
     <option value="not contains">
-     <title>does not contain</title>
+     <_title>does not contain</_title>
      <code>
        (match-all (not (header-contains ${header-field} ${word})))
      </code>
     </option>
     <option value="has-words">
-     <title>has words</title>
+     <_title>has words</_title>
      <code>
 	(match-all (header-has-words ${header-field} ${word}))
      </code>
     </option>
     <option value="not has-words">
-     <title>does not have words</title>
+     <_title>does not have words</_title>
      <code>
 	(match-all (not (header-has-words ${header-field} ${word})))
      </code>
     </option>
     <option value="is">
-     <title>is</title>
+     <_title>is</_title>
      <code>
        (match-all (header-matches ${header-field} ${word}))
      </code>
     </option>
     <option value="is not">
-     <title>is not</title>
+     <_title>is not</_title>
      <code>
        (match-all (not (header-matches ${header-field} ${word})))
      </code>
     </option>
     <option value="starts with">
-     <title>starts with</title>
+     <_title>starts with</_title>
      <code>
        (match-all (header-starts-with ${header-field} ${word}))
      </code>
     </option>
     <option value="not starts with">
-     <title>does not start with</title>
+     <_title>does not start with</_title>
      <code>
        (match-all (not (header-starts-with ${header-field} ${word})))
      </code>
     </option>
     <option value="ends with">
-     <title>ends with</title>
+     <_title>ends with</_title>
      <code>
        (match-all (header-ends-with ${header-field} ${word}))
      </code>
     </option>
     <option value="not ends with">
-     <title>does not end with</title>
+     <_title>does not end with</_title>
      <code>
        (match-all (not (header-ends-with ${header-field} ${word})))
      </code>
     </option>
     <option value="exists">
-     <title>exists</title>
+     <_title>exists</_title>
      <code>
        (match-all (header-exists ${header-field}))
      </code>
     </option>
     <option value="not exists">
-     <title>does not exist</title>
+     <_title>does not exist</_title>
      <code>
        (match-all (not (header-exists ${header-field})))
      </code>
     </option>
     <option value="matches soundex">
-     <title>sounds like</title>
+     <_title>sounds like</_title>
      <code>
         (match-all (header-soundex ${header-field} ${word}))
      </code>
     </option>
     <option value="not match soundex">
-     <title>does not sound like</title>
+     <_title>does not sound like</_title>
      <code>
         (match-all (not (header-soundex ${header-field} ${word})))
      </code>
@@ -555,76 +555,76 @@
  </part>
 
  <part name="anyheader">
-   <title>Any header</title>
+   <_title>Any header</_title>
    <input type="optionlist" name="header-type">
     <option value="contains">
-     <title>contains</title>
+     <_title>contains</_title>
      <code>
        (match-all (header-contains "" ${word}))
      </code>
     </option>
     <option value="not contains">
-     <title>does not contain</title>
+     <_title>does not contain</_title>
      <code>
        (match-all (not (header-contains "" ${word})))
      </code>
     </option>
     <option value="has-words">
-     <title>has words</title>
+     <_title>has words</_title>
      <code>
 	(match-all (header-has-words "" ${word}))
      </code>
     </option>
     <option value="not has-words">
-     <title>does not have words</title>
+     <_title>does not have words</_title>
      <code>
 	(match-all (not (header-has-words "" ${word})))
      </code>
     </option>
     <option value="is">
-     <title>is</title>
+     <_title>is</_title>
      <code>
        (match-all (header-matches "" ${word}))
      </code>
     </option>
     <option value="is not">
-     <title>is not</title>
+     <_title>is not</_title>
      <code>
        (match-all (not (header-matches "" ${word})))
      </code>
     </option>
     <option value="starts with">
-     <title>starts with</title>
+     <_title>starts with</_title>
      <code>
        (match-all (header-starts-with "" ${word}))
      </code>
     </option>
     <option value="not starts with">
-     <title>does not start with</title>
+     <_title>does not start with</_title>
      <code>
        (match-all (not (header-starts-with "" ${word})))
      </code>
     </option>
     <option value="ends with">
-     <title>ends with</title>
+     <_title>ends with</_title>
      <code>
        (match-all (header-ends-with "" ${word}))
      </code>
     </option>
     <option value="not ends with">
-     <title>does not end with</title>
+     <_title>does not end with</_title>
      <code>
        (match-all (not (header-ends-with "" ${word})))
      </code>
     </option>
     <option value="matches soundex">
-     <title>sounds like</title>
+     <_title>sounds like</_title>
      <code>
         (match-all (header-soundex "" ${word}))
      </code>
     </option>
     <option value="not match soundex">
-     <title>does not sound like</title>
+     <_title>does not sound like</_title>
      <code>
         (match-all (not (header-soundex "" ${word})))
      </code>
@@ -634,16 +634,16 @@
  </part>
 
  <part name="body">
-   <title>Message Body</title>
+   <_title>Message Body</_title>
    <input type="optionlist" name="body-type">
     <option value="contains">
-     <title>contains</title>
+     <_title>contains</_title>
      <code>
        (body-contains ${word})
      </code>
     </option>
     <option value="not contains">
-     <title>does not contain</title>
+     <_title>does not contain</_title>
      <code>
        (not (body-contains ${word}))
      </code>
@@ -652,33 +652,33 @@
    <input type="string" name="word"/>
  </part>
  <part name="sexp">
-   <title>Expression</title>
+   <_title>Expression</_title>
    <input type="code" name="code"/>
  </part>
 
  <part name="sent-date">
-  <title>Date sent</title>
+  <_title>Date sent</_title>
   <input type="optionlist" name="date-spec-type">
    <option value="is">
-    <title>is</title>
+    <_title>is</_title>
     <code>
        (match-all (= (get-sent-date) ${versus}))
     </code>
    </option>
    <option value="is-not">
-    <title>is not</title>
+    <_title>is not</_title>
     <code>
        (match-all (not (= (get-sent-date) ${versus})))
     </code>
    </option>
    <option value="before">
-    <title>is before</title>
+    <_title>is before</_title>
     <code>
        (match-all (&lt; (get-sent-date) ${versus}))
     </code>
    </option>
    <option value="after">
-    <title>is after</title>
+    <_title>is after</_title>
     <code>
        (match-all (&gt; (get-sent-date) ${versus}))
     </code>
@@ -688,28 +688,28 @@
  </part>
 
  <part name="recv-date">
-  <title>Date received</title>
+  <_title>Date received</_title>
   <input type="optionlist" name="date-spec-type">
    <option value="is">
-    <title>is</title>
+    <_title>is</_title>
     <code>
        (match-all (= (get-received-date) ${versus}))
     </code>
    </option>
    <option value="is-not">
-    <title>is not</title>
+    <_title>is not</_title>
     <code>
        (match-all (not (= (get-received-date) ${versus})))
     </code>
    </option>
    <option value="before">
-    <title>is before</title>
+    <_title>is before</_title>
     <code>
        (match-all (&lt; (get-received-date) ${versus}))
     </code>
    </option>
    <option value="after">
-    <title>is after</title>
+    <_title>is after</_title>
     <code>
        (match-all (&gt; (get-received-date) ${versus}))
     </code>
@@ -719,14 +719,14 @@
  </part>
 
  <part name="label">
-  <title>Label</title>
+  <_title>Label</_title>
   <input type="optionlist" name="label-type">
    <option value="is">
-    <title>is</title>
+    <_title>is</_title>
     <code func="e_mail_labels_get_filter_code"/>
    </option>
    <option value="is-not">
-    <title>is not</title>
+    <_title>is not</_title>
     <code func="e_mail_labels_get_filter_code"/>
     </option>
   </input>
@@ -736,28 +736,28 @@
  </part>
 
  <part name="score">
-  <title>Score</title>
+  <_title>Score</_title>
   <input type="optionlist" name="score-type">
    <option value="is">
-    <title>is</title>
+    <_title>is</_title>
     <code>
        (match-all (= (cast-int (user-tag "score")) ${versus}))
     </code>
    </option>
    <option value="is-not">
-    <title>is not</title>
+    <_title>is not</_title>
     <code>
        (match-all (not (= (cast-int (user-tag "score")) ${versus})))
     </code>
    </option>
    <option value="greater-than">
-    <title>is greater than</title>
+    <_title>is greater than</_title>
     <code>
        (match-all (&gt; (cast-int (user-tag "score")) ${versus}))
     </code>
    </option>
    <option value="less-than">
-    <title>is less than</title>
+    <_title>is less than</_title>
     <code>
        (match-all (&lt; (cast-int (user-tag "score")) ${versus}))
     </code>
@@ -767,16 +767,16 @@
  </part>
 
  <part name="size">
-  <title>Size (kB)</title>
+  <_title>Size (kB)</_title>
   <input type="optionlist" name="size-type">
    <option value="greater-than">
-    <title>is greater than</title>
+    <_title>is greater than</_title>
     <code>
        (match-all (&gt; (get-size) ${versus}))
     </code>
    </option>
    <option value="less-than">
-    <title>is less than</title>
+    <_title>is less than</_title>
     <code>
        (match-all (&lt; (get-size) ${versus}))
     </code>
@@ -786,16 +786,16 @@
  </part>
 
  <part name="status">
-  <title>Status</title>
+  <_title>Status</_title>
   <input type="optionlist" name="match-type">
    <option value="is">
-    <title>is</title>
+    <_title>is</_title>
     <code>
      (match-all (system-flag ${flag}))
     </code>
    </option>
    <option value="is not">
-    <title>is not</title>
+    <_title>is not</_title>
     <code>
      (match-all (not (system-flag ${flag})))
     </code>
@@ -803,34 +803,34 @@
   </input>
   <input type="optionlist" name="flag">
    <option value="Answered">
-    <title>Replied to</title>
+    <_title>Replied to</_title>
    </option>
    <option value="Deleted">
-    <title>Deleted</title>
+    <_title>Deleted</_title>
    </option>
    <option value="Draft">
-    <title>Draft</title>
+    <_title>Draft</_title>
    </option>
    <option value="Flagged">
-    <title>Important</title>
+    <_title>Important</_title>
    </option>
    <option value="Seen">
-    <title>Read</title>
+    <_title>Read</_title>
    </option>
   </input>
  </part>
 
  <part name="follow-up">
-  <title>Follow Up</title>
+  <_title>Follow Up</_title>
   <input type="optionlist" name="match-type">
    <option value="is">
-    <title>is Flagged</title>
+    <_title>is Flagged</_title>
     <code>
      (match-all (not (= (user-tag "follow-up") "")))
     </code>
    </option>
    <option value="is not">
-    <title>is not Flagged</title>
+    <_title>is not Flagged</_title>
     <code>
      (match-all (= (user-tag "follow-up") ""))
     </code>
@@ -839,16 +839,16 @@
  </part>
 
  <part name="completed-on">
-  <title>Completed On</title>
+  <_title>Completed On</_title>
   <input type="optionlist" name="date-spec-type">
    <option value="is set">
-    <title>is set</title>
+    <_title>is set</_title>
     <code>
        (match-all (not (= (user-tag "completed-on") "")))
     </code>
    </option>
    <option value="is not set">
-    <title>is not set</title>
+    <_title>is not set</_title>
     <code>
        (match-all (= (user-tag "completed-on") ""))
     </code>
@@ -857,16 +857,16 @@
  </part>
 
  <part name="attachments">
-  <title>Attachments</title>
+  <_title>Attachments</_title>
   <input type="optionlist" name="match-type">
    <option value="exist">
-    <title>Exist</title>
+    <_title>Exist</_title>
     <code>
      (match-all (system-flag "Attachments"))
     </code>
    </option>
    <option value="not exist">
-    <title>Do Not Exist</title>
+    <_title>Do Not Exist</_title>
     <code>
      (match-all (not (system-flag "Attachments")))
     </code>
@@ -875,22 +875,22 @@
  </part>
 
  <part name="mlist">
-  <title>Mailing list</title>
+  <_title>Mailing list</_title>
    <input type="optionlist" name="mlist-type">
     <option value="is">
-        <title>is</title>
+        <_title>is</_title>
         <code>(match-all (header-matches "x-camel-mlist" ${mlist}))</code>
     </option>
     <option value="is not">
-        <title>is not</title>
+        <_title>is not</_title>
         <code>(match-all (not (header-matches "x-camel-mlist" ${mlist})))</code>
     </option>
     <option value="contains">
-        <title>contains</title>
+        <_title>contains</_title>
         <code>(match-all (header-contains "x-camel-mlist" ${mlist}))</code>
     </option>
     <option value="not contains">
-        <title>does not contain</title>
+        <_title>does not contain</_title>
         <code>(match-all (not (header-contains "x-camel-mlist" ${mlist})))</code>
     </option>
    </input>
@@ -898,16 +898,16 @@
  </part>
 
  <part name="regex">
-  <title>Regex Match</title>
+  <_title>Regex Match</_title>
   <input type="optionlist" name="match-type">
    <option value="header">
-    <title>Message Header</title>
+    <_title>Message Header</_title>
     <code>
        (match-all (header-full-regex ${expression}))
     </code>
    </option>
    <option value="body">
-    <title>Message Body</title>
+    <_title>Message Body</_title>
     <code>
        (match-all (body-regex ${expression}))
     </code>
@@ -917,7 +917,7 @@
  </part>
 
     <part name="all">
-      <title>Match All</title>
+      <_title>Match All</_title>
       <code>
        (match-all #t)
       </code>
diff --git a/mail/vfoldertypes.xml b/mail/vfoldertypes.xml.in
index ed92cece62..51460c7a96 100644
--- a/mail/vfoldertypes.xml
+++ b/mail/vfoldertypes.xml.in
@@ -2,44 +2,44 @@
 <filterdescription>
 <partset>
  <part name="sender">
-  <title>Sender</title>
+  <_title>Sender</_title>
    <input type="optionlist" name="sender-type">
     <option value="contains">
-        <title>contains</title>
+        <_title>contains</_title>
 	<code>(match-all (header-contains "From" ${sender}))</code>
     </option>
     <option value="not contains">
-        <title>does not contain</title>
+        <_title>does not contain</_title>
         <code>(match-all (not (header-contains "From" ${sender})))</code>
     </option>
     <option value="is">
-        <title>is</title>
+        <_title>is</_title>
 	<code>(match-all (header-matches "From" ${sender}))</code>
     </option>
     <option value="is not">
-        <title>is not</title>
+        <_title>is not</_title>
         <code>(match-all (not (header-matches "From" ${sender})))</code>
     </option>
     <option value="starts with">
-     <title>starts with</title>
+     <_title>starts with</_title>
      <code>
         (match-all (header-starts-with "From" ${sender}))
      </code>
     </option>
     <option value="not starts with">
-     <title>does not start with</title>
+     <_title>does not start with</_title>
      <code>
         (match-all (not (header-starts-with "From" ${sender})))
      </code>
     </option>
     <option value="ends with">
-     <title>ends with</title>
+     <_title>ends with</_title>
      <code>
         (match-all (header-ends-with "From" ${sender}))
      </code>
     </option>
     <option value="not ends with">
-     <title>does not end with</title>
+     <_title>does not end with</_title>
      <code>
         (match-all (not (header-ends-with "From" ${sender})))
      </code>
@@ -49,17 +49,17 @@
  </part>
 
  <part name="to">
-   <title>Recipients</title>
+   <_title>Recipients</_title>
    <input type="optionlist" name="recipient-type">
     <option value="contains">
-     <title>contains</title>
+     <_title>contains</_title>
      <code>
 	(match-all (or (header-contains "To" ${recipient})
 	               (header-contains "Cc" ${recipient})))
      </code>
     </option>
     <option value="not contains">
-     <title>does not contain</title>
+     <_title>does not contain</_title>
      <code>
 	(match-all (not (or
                           (header-contains "To" ${recipient})
@@ -67,14 +67,14 @@
      </code>
     </option>
     <option value="is">
-     <title>is</title>
+     <_title>is</_title>
      <code>
 	(match-all (or (header-matches "To" ${recipient})
 	    	       (header-matches "Cc" ${recipient})))
      </code>
     </option>
     <option value="is not">
-     <title>is not</title>
+     <_title>is not</_title>
      <code>
 	(match-all (not (or
                (header-matches "To" ${recipient})
@@ -82,14 +82,14 @@
      </code>
     </option>
     <option value="starts with">
-     <title>starts with</title>
+     <_title>starts with</_title>
      <code>
         (match-all (or (header-starts-with "To" ${recipient})
 	    	       (header-starts-with "Cc" ${recipient})))
      </code>
     </option>
     <option value="not starts with">
-     <title>does not start with</title>
+     <_title>does not start with</_title>
      <code>
         (match-all (not (or
                (header-starts-with "To" ${recipient})
@@ -97,14 +97,14 @@
      </code>
     </option>
     <option value="ends with">
-     <title>ends with</title>
+     <_title>ends with</_title>
      <code>
         (match-all (or (header-ends-with "To" ${recipient})
 	    	       (header-ends-with "Cc" ${recipient})))
      </code>
     </option>
     <option value="not ends with">
-     <title>does not end with</title>
+     <_title>does not end with</_title>
      <code>
         (match-all (not (or
                (header-ends-with "To" ${recipient})
@@ -116,64 +116,64 @@
  </part>
 
  <part name="toonly">
-   <title>To</title>
+   <_title>To</_title>
    <input type="optionlist" name="recipient-type">
     <option value="contains">
-     <title>contains</title>
+     <_title>contains</_title>
      <code>
 	(match-all (header-contains "To" ${recipient}))
      </code>
     </option>
     <option value="not contains">
-     <title>does not contain</title>
+     <_title>does not contain</_title>
      <code>
 	(match-all (not (header-contains "To" ${recipient})))
      </code>
     </option>
     <option value="is">
-     <title>is</title>
+     <_title>is</_title>
      <code>
 	(match-all (header-matches "To" ${recipient}))
      </code>
     </option>
     <option value="is not">
-     <title>is not</title>
+     <_title>is not</_title>
      <code>
 	(match-all (not (header-matches "To" ${recipient})))
      </code>
     </option>
     <option value="starts with">
-     <title>starts with</title>
+     <_title>starts with</_title>
      <code>
         (match-all (header-starts-with "To" ${recipient}))
      </code>
     </option>
     <option value="not starts with">
-     <title>does not start with</title>
+     <_title>does not start with</_title>
      <code>
         (match-all (not (header-starts-with "To" ${recipient})))
      </code>
     </option>
     <option value="ends with">
-     <title>ends with</title>
+     <_title>ends with</_title>
      <code>
         (match-all (header-ends-with "To" ${recipient}))
      </code>
     </option>
     <option value="not ends with">
-     <title>does not end with</title>
+     <_title>does not end with</_title>
      <code>
         (match-all (not (header-ends-with "To" ${recipient})))
      </code>
     </option>
     <option value="matches soundex">
-     <title>sounds like</title>
+     <_title>sounds like</_title>
      <code>
 	(match-all (header-soundex "To" ${recipient}))
      </code>
     </option>
     <option value="not match soundex">
-     <title>does not sound like</title>
+     <_title>does not sound like</_title>
      <code>
 	(match-all (not (header-soundex "To" ${recipient})))
      </code>
@@ -183,64 +183,64 @@
  </part>
 
  <part name="cc">
-   <title>CC</title>
+   <_title>CC</_title>
    <input type="optionlist" name="recipient-type">
     <option value="contains">
-     <title>contains</title>
+     <_title>contains</_title>
      <code>
 	(match-all (header-contains "Cc" ${recipient}))
      </code>
     </option>
     <option value="not contains">
-     <title>does not contain</title>
+     <_title>does not contain</_title>
      <code>
 	(match-all (not (header-contains "Cc" ${recipient})))
      </code>
     </option>
     <option value="is">
-     <title>is</title>
+     <_title>is</_title>
      <code>
 	(match-all (header-matches "Cc" ${recipient}))
      </code>
     </option>
     <option value="is not">
-     <title>is not</title>
+     <_title>is not</_title>
      <code>
 	(match-all (not (header-matches "Cc" ${recipient})))
      </code>
     </option>
     <option value="starts with">
-     <title>starts with</title>
+     <_title>starts with</_title>
      <code>
         (match-all (header-starts-with "Cc" ${recipient}))
      </code>
     </option>
     <option value="not starts with">
-     <title>does not start with</title>
+     <_title>does not start with</_title>
      <code>
         (match-all (not (header-starts-with "Cc" ${recipient})))
      </code>
     </option>
     <option value="ends with">
-     <title>ends with</title>
+     <_title>ends with</_title>
      <code>
         (match-all (header-ends-with "Cc" ${recipient}))
      </code>
     </option>
     <option value="not ends with">
-     <title>does not end with</title>
+     <_title>does not end with</_title>
      <code>
         (match-all (not (header-ends-with "Cc" ${recipient})))
      </code>
     </option>
     <option value="matches soundex">
-     <title>sounds like</title>
+     <_title>sounds like</_title>
      <code>
 	(match-all (header-soundex "Cc" ${recipient}))
      </code>
     </option>
     <option value="not match soundex">
-     <title>does not sound like</title>
+     <_title>does not sound like</_title>
      <code>
 	(match-all (not (header-soundex "Cc" ${recipient})))
      </code>
@@ -250,64 +250,64 @@
  </part>
 
  <part name="bcc">
-   <title>BCC</title>
+   <_title>BCC</_title>
    <input type="optionlist" name="recipient-type">
     <option value="contains">
-     <title>contains</title>
+     <_title>contains</_title>
      <code>
 	(match-all (header-contains "Bcc" ${recipient}))
      </code>
     </option>
     <option value="not contains">
-     <title>does not contain</title>
+     <_title>does not contain</_title>
      <code>
 	(match-all (not (header-contains "Bcc" ${recipient})))
      </code>
     </option>
     <option value="is">
-     <title>is</title>
+     <_title>is</_title>
      <code>
 	(match-all (header-matches "Bcc" ${recipient}))
      </code>
     </option>
     <option value="is not">
-     <title>is not</title>
+     <_title>is not</_title>
      <code>
 	(match-all (not (header-matches "Bcc" ${recipient})))
      </code>
     </option>
     <option value="starts with">
-     <title>starts with</title>
+     <_title>starts with</_title>
      <code>
         (match-all (header-starts-with "Bcc" ${recipient}))
      </code>
     </option>
     <option value="not starts with">
-     <title>does not start with</title>
+     <_title>does not start with</_title>
      <code>
         (match-all (not (header-starts-with "Bcc" ${recipient})))
      </code>
     </option>
     <option value="ends with">
-     <title>ends with</title>
+     <_title>ends with</_title>
      <code>
         (match-all (header-ends-with "Bcc" ${recipient}))
      </code>
     </option>
     <option value="not ends with">
-     <title>does not end with</title>
+     <_title>does not end with</_title>
      <code>
         (match-all (not (header-ends-with "Bcc" ${recipient})))
      </code>
     </option>
     <option value="matches soundex">
-     <title>sounds like</title>
+     <_title>sounds like</_title>
      <code>
 	(match-all (header-soundex "Bcc" ${recipient}))
      </code>
     </option>
     <option value="not match soundex">
-     <title>does not sound like</title>
+     <_title>does not sound like</_title>
      <code>
 	(match-all (not (header-soundex "Bcc" ${recipient})))
      </code>
@@ -317,10 +317,10 @@
  </part>
 
  <part name="senderto">
-   <title>Sender or Recipients</title>
+   <_title>Sender or Recipients</_title>
    <input type="optionlist" name="recipient-type">
     <option value="contains">
-     <title>contains</title>
+     <_title>contains</_title>
      <code>
 	(match-all (or (header-contains "From" ${recipient})
 	               (header-contains "To" ${recipient})
@@ -328,7 +328,7 @@
      </code>
     </option>
     <option value="not contains">
-     <title>does not contain</title>
+     <_title>does not contain</_title>
      <code>
 	(match-all (not (or
                           (header-contains "From" ${recipient})
@@ -337,7 +337,7 @@
      </code>
     </option>
     <option value="is">
-     <title>is</title>
+     <_title>is</_title>
      <code>
 	(match-all (or (header-matches "From" ${recipient})
 	    	       (header-matches "To" ${recipient})
@@ -345,7 +345,7 @@
      </code>
     </option>
     <option value="is not">
-     <title>is not</title>
+     <_title>is not</_title>
      <code>
 	(match-all (not (or
                (header-matches "From" ${recipient})
@@ -354,7 +354,7 @@
      </code>
     </option>
     <option value="starts with">
-     <title>starts with</title>
+     <_title>starts with</_title>
      <code>
         (match-all (or (header-starts-with "From" ${recipient})
 	    	       (header-starts-with "To" ${recipient})
@@ -362,7 +362,7 @@
      </code>
     </option>
     <option value="not starts with">
-     <title>does not start with</title>
+     <_title>does not start with</_title>
      <code>
         (match-all (not (or
                (header-starts-with "From" ${recipient})
@@ -371,7 +371,7 @@
      </code>
     </option>
     <option value="ends with">
-     <title>ends with</title>
+     <_title>ends with</_title>
      <code>
         (match-all (or (header-ends-with "From" ${recipient})
 	    	       (header-ends-with "To" ${recipient})
@@ -379,7 +379,7 @@
      </code>
     </option>
     <option value="not ends with">
-     <title>does not end with</title>
+     <_title>does not end with</_title>
      <code>
         (match-all (not (or
                (header-ends-with "From" ${recipient})
@@ -392,64 +392,64 @@
  </part>
 
  <part name="subject">
-   <title>Subject</title>
+   <_title>Subject</_title>
    <input type="optionlist" name="subject-type">
     <option value="contains">
-     <title>contains</title>
+     <_title>contains</_title>
      <code>
 	(match-all (header-contains "Subject" ${subject}))
      </code>
     </option>
     <option value="not contains">
-     <title>does not contain</title>
+     <_title>does not contain</_title>
      <code>
 	(match-all (not (header-contains "Subject" ${subject})))
      </code>
     </option>
     <option value="has-words">
-     <title>has words</title>
+     <_title>has words</_title>
      <code>
 	(match-all (header-has-words "Subject" ${subject}))
      </code>
     </option>
     <option value="not has-words">
-     <title>does not have words</title>
+     <_title>does not have words</_title>
      <code>
 	(match-all (not (header-has-words "Subject" ${subject})))
      </code>
     </option>
     <option value="is">
-     <title>is</title>
+     <_title>is</_title>
      <code>
 	(match-all (header-matches "Subject" ${subject}))
      </code>
     </option>
     <option value="is not">
-     <title>is not</title>
+     <_title>is not</_title>
      <code>
 	(match-all (not (header-matches "Subject" ${subject})))
      </code>
     </option>
     <option value="starts with">
-     <title>starts with</title>
+     <_title>starts with</_title>
      <code>
 	(match-all (header-starts-with "Subject" ${subject}))
      </code>
     </option>
     <option value="not starts with">
-     <title>does not start with</title>
+     <_title>does not start with</_title>
      <code>
 	(match-all (not (header-starts-with "Subject" ${subject})))
      </code>
     </option>
     <option value="ends with">
-     <title>ends with</title>
+     <_title>ends with</_title>
      <code>
 	(match-all (header-ends-with "Subject" ${subject}))
      </code>
     </option>
     <option value="not ends with">
-     <title>does not end with</title>
+     <_title>does not end with</_title>
      <code>
 	(match-all (not (header-ends-with "Subject" ${subject})))
      </code>
@@ -459,89 +459,89 @@
  </part>
 
  <part name="header">
-   <title>Specific header</title>
+   <_title>Specific header</_title>
    <input type="string" name="header-field" allow-empty="false"/>
    <input type="optionlist" name="header-type">
     <option value="contains">
-     <title>contains</title>
+     <_title>contains</_title>
      <code>
 	(match-all (header-contains ${header-field} ${word}))
      </code>
     </option>
     <option value="not contains">
-     <title>does not contain</title>
+     <_title>does not contain</_title>
      <code>
 	(match-all (not (header-contains ${header-field} ${word})))
      </code>
     </option>
     <option value="has-words">
-     <title>has words</title>
+     <_title>has words</_title>
      <code>
 	(match-all (header-has-words ${header-field} ${word}))
      </code>
     </option>
     <option value="not has-words">
-     <title>does not have words</title>
+     <_title>does not have words</_title>
      <code>
 	(match-all (not (header-has-words ${header-field} ${word})))
      </code>
     </option>
     <option value="is">
-     <title>is</title>
+     <_title>is</_title>
      <code>
 	(match-all (header-matches ${header-field} ${word}))
      </code>
     </option>
     <option value="is not">
-     <title>is not</title>
+     <_title>is not</_title>
      <code>
 	(match-all (not (header-matches ${header-field} ${word})))
      </code>
     </option>
     <option value="starts with">
-     <title>starts with</title>
+     <_title>starts with</_title>
      <code>
 	(match-all (header-starts-with ${header-field} ${word}))
      </code>
     </option>
     <option value="not starts with">
-     <title>does not start with</title>
+     <_title>does not start with</_title>
      <code>
 	(match-all (not (header-starts-with ${header-field} ${word})))
      </code>
     </option>
     <option value="ends with">
-     <title>ends with</title>
+     <_title>ends with</_title>
      <code>
 	(match-all (header-ends-with ${header-field} ${word}))
      </code>
     </option>
     <option value="not ends with">
-     <title>does not end with</title>
+     <_title>does not end with</_title>
      <code>
 	(match-all (not (header-ends-with ${header-field} ${word})))
      </code>
     </option>
     <option value="exists">
-     <title>exists</title>
+     <_title>exists</_title>
      <code>
 	(match-all (header-exists ${header-field}))
      </code>
     </option>
     <option value="not exists">
-     <title>does not exist</title>
+     <_title>does not exist</_title>
      <code>
 	(match-all (not (header-exists ${header-field})))
      </code>
     </option>
     <option value="matches soundex">
-     <title>sounds like</title>
+     <_title>sounds like</_title>
      <code>
         (match-all (header-soundex ${header-field} ${word}))
      </code>
     </option>
     <option value="not match soundex">
-     <title>does not sound like</title>
+     <_title>does not sound like</_title>
      <code>
         (match-all (not (header-soundex ${header-field} ${word})))
      </code>
@@ -551,76 +551,76 @@
  </part>
 
  <part name="anyheader">
-   <title>Any header</title>
+   <_title>Any header</_title>
    <input type="optionlist" name="header-type">
     <option value="contains">
-     <title>contains</title>
+     <_title>contains</_title>
      <code>
 	(match-all (header-contains "" ${word}))
      </code>
     </option>
     <option value="not contains">
-     <title>does not contain</title>
+     <_title>does not contain</_title>
      <code>
 	(match-all (not (header-contains "" ${word})))
      </code>
     </option>
     <option value="has-words">
-     <title>has words</title>
+     <_title>has words</_title>
      <code>
 	(match-all (header-has-words "" ${word}))
      </code>
     </option>
     <option value="not has-words">
-     <title>does not have words</title>
+     <_title>does not have words</_title>
      <code>
 	(match-all (not (header-has-words "" ${word})))
      </code>
     </option>
     <option value="is">
-     <title>is</title>
+     <_title>is</_title>
      <code>
 	(match-all (header-matches "" ${word}))
      </code>
     </option>
     <option value="is not">
-     <title>is not</title>
+     <_title>is not</_title>
      <code>
 	(match-all (not (header-matches "" ${word})))
      </code>
     </option>
     <option value="starts with">
-     <title>starts with</title>
+     <_title>starts with</_title>
      <code>
 	(match-all (header-starts-with "" ${word}))
      </code>
     </option>
     <option value="not starts with">
-     <title>does not start with</title>
+     <_title>does not start with</_title>
      <code>
 	(match-all (not (header-starts-with "" ${word})))
      </code>
     </option>
     <option value="ends with">
-     <title>ends with</title>
+     <_title>ends with</_title>
      <code>
 	(match-all (header-ends-with "" ${word}))
      </code>
     </option>
     <option value="not ends with">
-     <title>does not end with</title>
+     <_title>does not end with</_title>
      <code>
 	(match-all (not (header-ends-with "" ${word})))
      </code>
     </option>
     <option value="matches soundex">
-     <title>sounds like</title>
+     <_title>sounds like</_title>
      <code>
         (match-all (header-soundex "" ${word}))
      </code>
     </option>
     <option value="not match soundex">
-     <title>does not sound like</title>
+     <_title>does not sound like</_title>
      <code>
         (match-all (not (header-soundex "" ${word})))
      </code>
@@ -630,16 +630,16 @@
  </part>
 
  <part name="body">
-   <title>Message Body</title>
+   <_title>Message Body</_title>
    <input type="optionlist" name="body-type">
     <option value="contains">
-     <title>contains</title>
+     <_title>contains</_title>
      <code>
 	(body-contains ${word})
      </code>
     </option>
     <option value="not contains">
-     <title>does not contain</title>
+     <_title>does not contain</_title>
      <code>
 	(not (body-contains ${word}))
      </code>
@@ -648,33 +648,33 @@
    <input type="string" name="word" allow-empty="false"/>
  </part>
  <part name="sexp">
-   <title>Expression</title>
+   <_title>Expression</_title>
    <input type="code" name="code"/>
  </part>
 
  <part name="sent-date">
-  <title>Date sent</title>
+  <_title>Date sent</_title>
   <input type="optionlist" name="date-spec-type">
    <option value="is">
-    <title>is</title>
+    <_title>is</_title>
     <code>
        (match-all (= (get-sent-date) ${versus}))
     </code>
    </option>
    <option value="is-not">
-    <title>is not</title>
+    <_title>is not</_title>
     <code>
        (match-all (not (= (get-sent-date) ${versus})))
     </code>
    </option>
    <option value="before">
-    <title>is before</title>
+    <_title>is before</_title>
     <code>
        (match-all (&lt; (get-sent-date) ${versus}))
     </code>
    </option>
    <option value="after">
-    <title>is after</title>
+    <_title>is after</_title>
     <code>
        (match-all (&gt; (get-sent-date) ${versus}))
     </code>
@@ -684,28 +684,28 @@
  </part>
 
  <part name="recv-date">
-  <title>Date received</title>
+  <_title>Date received</_title>
   <input type="optionlist" name="date-spec-type">
    <option value="is">
-    <title>is</title>
+    <_title>is</_title>
     <code>
        (match-all (= (get-received-date) ${versus}))
     </code>
    </option>
    <option value="is-not">
-    <title>is not</title>
+    <_title>is not</_title>
     <code>
        (match-all (not (= (get-received-date) ${versus})))
     </code>
    </option>
    <option value="before">
-    <title>is before</title>
+    <_title>is before</_title>
     <code>
        (match-all (&lt; (get-received-date) ${versus}))
     </code>
    </option>
    <option value="after">
-    <title>is after</title>
+    <_title>is after</_title>
     <code>
        (match-all (&gt; (get-received-date) ${versus}))
     </code>
@@ -715,14 +715,14 @@
  </part>
 
  <part name="label">
-  <title>Label</title>
+  <_title>Label</_title>
   <input type="optionlist" name="label-type">
    <option value="is">
-    <title>is</title>
+    <_title>is</_title>
     <code func="e_mail_labels_get_filter_code"/>
    </option>
    <option value="is-not">
-    <title>is not</title>
+    <_title>is not</_title>
     <code func="e_mail_labels_get_filter_code"/>
    </option>
   </input>
@@ -732,28 +732,28 @@
  </part>
 
  <part name="score">
-  <title>Score</title>
+  <_title>Score</_title>
   <input type="optionlist" name="score-type">
    <option value="is">
-    <title>is</title>
+    <_title>is</_title>
     <code>
        (match-all (= (cast-int (user-tag "score")) ${versus}))
     </code>
    </option>
    <option value="is-not">
-    <title>is not</title>
+    <_title>is not</_title>
     <code>
        (match-all (not (= (cast-int (user-tag "score")) ${versus})))
     </code>
    </option>
    <option value="greater-than">
-    <title>is greater than</title>
+    <_title>is greater than</_title>
     <code>
        (match-all (&gt; (cast-int (user-tag "score")) ${versus}))
     </code>
    </option>
    <option value="less-than">
-    <title>is less than</title>
+    <_title>is less than</_title>
     <code>
        (match-all (&lt; (cast-int (user-tag "score")) ${versus}))
     </code>
@@ -763,16 +763,16 @@
  </part>
 
  <part name="size">
-  <title>Size (kB)</title>
+  <_title>Size (kB)</_title>
   <input type="optionlist" name="size-type">
    <option value="greater-than">
-    <title>is greater than</title>
+    <_title>is greater than</_title>
     <code>
        (match-all (&gt; (get-size) ${versus}))
     </code>
    </option>
    <option value="less-than">
-    <title>is less than</title>
+    <_title>is less than</_title>
     <code>
        (match-all (&lt; (get-size) ${versus}))
     </code>
@@ -782,16 +782,16 @@
  </part>
 
  <part name="status">
-  <title>Status</title>
+  <_title>Status</_title>
   <input type="optionlist" name="match-type">
    <option value="is">
-    <title>is</title>
+    <_title>is</_title>
     <code>
      (match-all (system-flag ${flag}))
     </code>
    </option>
    <option value="is not">
-    <title>is not</title>
+    <_title>is not</_title>
     <code>
      (match-all (not (system-flag ${flag})))
     </code>
@@ -799,37 +799,37 @@
   </input>
   <input type="optionlist" name="flag">
    <option value="Answered">
-    <title>Replied to</title>
+    <_title>Replied to</_title>
    </option>
    <option value="Deleted">
-    <title>Deleted</title>
+    <_title>Deleted</_title>
    </option>
    <option value="Draft">
-    <title>Draft</title>
+    <_title>Draft</_title>
    </option>
    <option value="Flagged">
-    <title>Important</title>
+    <_title>Important</_title>
    </option>
    <option value="Seen">
-    <title>Read</title>
+    <_title>Read</_title>
    </option>
    <option value="Junk">
-    <title>Junk</title>
+    <_title>Junk</_title>
    </option>
   </input>
  </part>
 
  <part name="follow-up">
-  <title>Follow Up</title>
+  <_title>Follow Up</_title>
   <input type="optionlist" name="match-type">
    <option value="is">
-    <title>is Flagged</title>
+    <_title>is Flagged</_title>
     <code>
      (match-all (not (= (user-tag "follow-up") "")))
     </code>
    </option>
    <option value="is not">
-    <title>is not Flagged</title>
+    <_title>is not Flagged</_title>
     <code>
      (match-all (= (user-tag "follow-up") ""))
     </code>
@@ -838,16 +838,16 @@
  </part>
 
  <part name="completed-on">
-  <title>Completed On</title>
+  <_title>Completed On</_title>
   <input type="optionlist" name="date-spec-type">
    <option value="is set">
-    <title>is set</title>
+    <_title>is set</_title>
     <code>
        (match-all (not (= (user-tag "completed-on") "")))
     </code>
    </option>
    <option value="is not set">
-    <title>is not set</title>
+    <_title>is not set</_title>
     <code>
        (match-all (= (user-tag "completed-on") ""))
     </code>
@@ -856,16 +856,16 @@
  </part>
 
  <part name="attachments">
-  <title>Attachments</title>
+  <_title>Attachments</_title>
   <input type="optionlist" name="match-type">
    <option value="exist">
-    <title>Exist</title>
+    <_title>Exist</_title>
     <code>
      (match-all (system-flag "Attachments"))
     </code>
    </option>
    <option value="not exist">
-    <title>Do Not Exist</title>
+    <_title>Do Not Exist</_title>
     <code>
      (match-all (not (system-flag "Attachments")))
     </code>
@@ -874,22 +874,22 @@
  </part>
 
  <part name="mlist">
-  <title>Mailing list</title>
+  <_title>Mailing list</_title>
    <input type="optionlist" name="mlist-type">
     <option value="is">
-        <title>is</title>
+        <_title>is</_title>
         <code>(match-all (header-matches "x-camel-mlist" ${mlist}))</code>
     </option>
     <option value="is not">
-        <title>is not</title>
+        <_title>is not</_title>
         <code>(match-all (not (header-matches "x-camel-mlist" ${mlist})))</code>
     </option>
     <option value="contains">
-        <title>contains</title>
+        <_title>contains</_title>
         <code>(match-all (header-contains "x-camel-mlist" ${mlist}))</code>
     </option>
     <option value="not contains">
-        <title>does not contain</title>
+        <_title>does not contain</_title>
         <code>(match-all (not (header-contains "x-camel-mlist" ${mlist})))</code>
     </option>
    </input>
@@ -897,16 +897,16 @@
  </part>
 
  <part name="regex">
-  <title>Regex Match</title>
+  <_title>Regex Match</_title>
   <input type="optionlist" name="match-type">
    <option value="header">
-    <title>Message Header</title>
+    <_title>Message Header</_title>
     <code>
        (match-all (header-full-regex ${expression}))
     </code>
    </option>
    <option value="body">
-    <title>Message Body</title>
+    <_title>Message Body</_title>
     <code>
        (match-all (body-regex ${expression}))
     </code>
@@ -916,16 +916,16 @@
  </part>
 
  <part name="location">
-  <title>Message Location</title>
+  <_title>Message Location</_title>
   <input type="optionlist" name="msglocation-type">
    <option value="is">
-    <title>is</title>
+    <_title>is</_title>
     <code>
       (match-all (message-location ${folder}))
     </code>
    </option>
    <option value="is-not">
-    <title>is not</title>
+    <_title>is not</_title>
     <code>
       (match-all (not (message-location ${folder})))
     </code>
@@ -935,7 +935,7 @@
  </part>
 
     <part name="all">
-      <title>Match All</title>
+      <_title>Match All</_title>
       <code>
        (match-all #t)
       </code>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4ebaf4a311..87ec978c89 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -342,7 +342,6 @@ mail/e-mail-ui-session.c
 mail/em-composer-utils.c
 mail/em-filter-editor.c
 mail/em-filter-editor-folder-element.c
-mail/em-filter-i18n.h
 mail/em-filter-rule.c
 mail/em-folder-properties.c
 mail/em-folder-selection-button.c
@@ -354,6 +353,7 @@ mail/em-subscription-editor.c
 mail/em-utils.c
 mail/em-vfolder-editor.c
 mail/em-vfolder-editor-rule.c
+mail/filtertypes.xml.in
 mail/importers/elm-importer.c
 mail/importers/evolution-mbox-importer.c
 mail/importers/mail-importer.c
@@ -366,7 +366,8 @@ mail/mail-send-recv.c
 mail/mail-vfolder-ui.c
 mail/message-list.c
 mail/message-list.etspec
-mail/searchtypes.xml
+mail/searchtypes.xml.in
+mail/vfoldertypes.xml.in
 modules/addressbook/autocompletion-config.c
 modules/addressbook/eab-composer-util.c
 modules/addressbook/e-book-shell-backend.c