Merge branch...

Merge branch '6031-rspamd-is-using-the-wrong-settings-for-add_header-rewrite_subject' into 'develop'

Resolve "rspamd is using the wrong settings for add_header / rewrite_subject"

Closes #6031

See merge request ispconfig/ispconfig3!1393

server/conf/rspamd_users.inc.conf.master

@@ -38,9 +38,11 @@
 		actions {
 		<tmpl_if name='rspamd_spam_tag_method' op='==' value='rewrite_subject'>
 			"rewrite subject" =  <tmpl_var name='rspamd_spam_tag_level'>;
+			"add header" = null;
 		</tmpl_if>
 		<tmpl_if name='rspamd_spam_tag_method' op='==' value='add_header'>
 			"add header" =  <tmpl_var name='rspamd_spam_tag_level'>;
+			"rewrite subject" = null;
 		</tmpl_if>
 			reject = <tmpl_var name='rspamd_spam_kill_level'>;
 	<tmpl_if name='greylisting'>