Merge pull request #1062 from racke/pr/compose-mail-template-fix by racke

Adjust compose_mail template to the obsolescence of the merge_feature configuration parameter

default/web_tt2/compose_mail.tt2

@@ -53,7 +53,7 @@
             <textarea name="body" id="body" cols="80" rows="25">[% body %]</textarea>
             <br />
 
-            [% IF listconf.merge_feature == 'on' %]
+            [% IF listconf.personalization_feature == 'on' && listconf.personalization.web_apply_on == 'all' %]
                 <br />
                 <b>[%|loc%]Messages customization: use the template syntax:[%END%] <a href="http://www.tt2.org">TT2</a></b>
                 <br />