diff --git a/template/config_encryption.cs b/template/config_encryption.cs
deleted file mode 100644
index 0b6c641..0000000
--- a/template/config_encryption.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-<div class="title">
-	<h1><?cs var:html_escape(Lang.Title.GnupgOptions) ?></h1>
-</div>
-
-<div class="introduction">
-	<p><?cs var:html_escape(Lang.Introduction.GnupgOptions) ?></p>
-</div>
-
-<fieldset>
-	<legend><?cs var:html_escape(Lang.Legend.GnupgOptions) ?> </legend>
-
-	<?cs call:form_header("config_encryption") ?>
-		<input type="hidden" name="config_subset" value="encryption" />
-
-		<?cs call:show_options(UI.Options.Config.GnupgOptions) ?>
-
-	<ul><li>
-		<input type="hidden" name="action" value="config_do" />
-		<button type="submit" name="send" value="do"><?cs var:html_escape(Lang.Buttons.UpdateConfiguration) ?></button></li></ul>
-
-	</form>
-
-</fieldset>
diff --git a/template/config_gpgezmlm.cs b/template/config_gpgezmlm.cs
new file mode 100644
index 0000000..39a21d4
--- /dev/null
+++ b/template/config_gpgezmlm.cs
@@ -0,0 +1,23 @@
+<div class="title">
+	<h1><?cs var:html_escape(Lang.Title.GpgEzmlmOptions) ?></h1>
+</div>
+
+<div class="introduction">
+	<p><?cs var:html_escape(Lang.Introduction.GpgEzmlmOptions) ?></p>
+</div>
+
+<fieldset>
+	<legend><?cs var:html_escape(Lang.Legend.GpgEzmlmOptions) ?> </legend>
+
+	<?cs call:form_header("config_gpgezmlm") ?>
+		<input type="hidden" name="config_subset" value="gpgezmlm" />
+
+		<?cs call:show_options(UI.Options.Config.GpgEzmlmOptions) ?>
+
+	<ul><li>
+		<input type="hidden" name="action" value="config_do" />
+		<button type="submit" name="send" value="do"><?cs var:html_escape(Lang.Buttons.UpdateConfiguration) ?></button></li></ul>
+
+	</form>
+
+</fieldset>
diff --git a/template/config_options/gnupg_keycomment.cs b/template/config_options/gnupg_keycomment.cs
index 04ba690..5974428 100644
--- a/template/config_options/gnupg_keycomment.cs
+++ b/template/config_options/gnupg_keycomment.cs
@@ -1,4 +1,4 @@
-<?cs if:Data.List.Features.Crypto ?>
+<?cs if:Data.List.Features.GpgKeyRing ?>
 <!-- comment for the key (second part of the human readable key description) -->
 
 <label for="gnupg_keycomment"><?cs var:html_escape(Lang.Misc.GnupgKeyComment) ?>:</label>
diff --git a/template/config_options/gnupg_keyexpires.cs b/template/config_options/gnupg_keyexpires.cs
index ee14731..175da80 100644
--- a/template/config_options/gnupg_keyexpires.cs
+++ b/template/config_options/gnupg_keyexpires.cs
@@ -1,4 +1,4 @@
-<?cs if:Data.List.Features.Crypto ?>
+<?cs if:Data.List.Features.GpgKeyRing ?>
 <!-- expiration of the key (in years) -->
 
 <label for="gnupg_keyexpires"><?cs var:html_escape(Lang.Misc.GnupgKeyExpires) ?>:</label>
diff --git a/template/config_options/gnupg_keyname.cs b/template/config_options/gnupg_keyname.cs
index 81b508f..aa3dedf 100644
--- a/template/config_options/gnupg_keyname.cs
+++ b/template/config_options/gnupg_keyname.cs
@@ -1,4 +1,4 @@
-<?cs if:Data.List.Features.Crypto ?>
+<?cs if:Data.List.Features.GpgKeyRing ?>
 <!-- name of the key (first part of the human readable key description) -->
 
 <label for="gnupg_keyname"><?cs var:html_escape(Lang.Misc.GnupgKeyName) ?>:</label>
diff --git a/template/config_options/gnupg_keysize.cs b/template/config_options/gnupg_keysize.cs
index 13fdb30..778bd10 100644
--- a/template/config_options/gnupg_keysize.cs
+++ b/template/config_options/gnupg_keysize.cs
@@ -1,4 +1,4 @@
-<?cs if:Data.List.Features.Crypto ?>
+<?cs if:Data.List.Features.GpgKeyRing ?>
 <!-- REMOVE --><?cs include:TemplateDir + '/macros.cs' ?>
 <!-- length of the key (bytes) -->
 <label for="gnupg_keysize"><?cs var:html_escape(Lang.Misc.GnupgKeySize) ?>:</label>
diff --git a/template/config_options/gnupg_plain_without_key.cs b/template/config_options/gnupg_plain_without_key.cs
deleted file mode 100644
index 6c373bc..0000000
--- a/template/config_options/gnupg_plain_without_key.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-<?cs if:Data.List.Features.Crypto ?>
-<!-- REMOVE --><?cs include:TemplateDir + '/macros.cs' ?>
-<!-- Gnupg: send plaintext if no key is available -->
-<?cs call:checkbox("gnupg_plain_without_key") ?>
-<?cs /if ?>
-
diff --git a/template/config_options/gpgezmlm_nokeynocrypt.cs b/template/config_options/gpgezmlm_nokeynocrypt.cs
new file mode 100644
index 0000000..0efa405
--- /dev/null
+++ b/template/config_options/gpgezmlm_nokeynocrypt.cs
@@ -0,0 +1,6 @@
+<?cs if:Data.List.Features.GpgEzmlm ?>
+<!-- REMOVE --><?cs include:TemplateDir + '/macros.cs' ?>
+<!-- Gnupg: send warning without original content if no key is available -->
+<?cs call:checkbox("gpgezmlm_nokeynocrypt") ?>
+<?cs /if ?>
+
diff --git a/template/config_options/gnupg_sign_messages.cs b/template/config_options/gpgezmlm_signmessages.cs
similarity index 56%
rename from template/config_options/gnupg_sign_messages.cs
rename to template/config_options/gpgezmlm_signmessages.cs
index fc8aba4..64594af 100644
--- a/template/config_options/gnupg_sign_messages.cs
+++ b/template/config_options/gpgezmlm_signmessages.cs
@@ -1,6 +1,6 @@
-<?cs if:Data.List.Features.Crypto ?>
+<?cs if:Data.List.Features.GpgEzmlm ?>
 <!-- REMOVE --><?cs include:TemplateDir + '/macros.cs' ?>
 <!-- Gnupg: sign outgoing messages -->
-<?cs call:checkbox("gnupg_sign_messages") ?>
+<?cs call:checkbox("gpgezmlm_signmessages") ?>
 <?cs /if ?>
 
diff --git a/template/gnupg_convert.cs b/template/gnupg_convert.cs
deleted file mode 100644
index df902a1..0000000
--- a/template/gnupg_convert.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="title">
-	<h1><?cs var:html_escape(Lang.Title.GnupgConvert) ?></h1>
-</div>
-
-<div class="introduction">
-	<p><?cs var:html_escape(Lang.Introduction.GnupgConvert) ?></p>
-</div>
-
-<fieldset>
-	<legend><?cs var:html_escape(Lang.Legend.GnupgConvert) ?> </legend>
-
-	<?cs call:form_header("gnupg_convert") ?>
-	<ul><li>
-		<?cs if:Data.List.Features.Crypto
-			?><button type="submit" name="send" value="do"><?cs
-			var:html_escape(Lang.Buttons.GnupgConvertToPlain) ?></button>
-			<input type="hidden" name="action" value="gnupg_convert_disable" /><?cs
-		else
-			?><button type="submit" name="send" value="do"><?cs
-			var:html_escape(Lang.Buttons.GnupgConvertToEncrypted) ?></button>
-			<input type="hidden" name="action" value="gnupg_convert_enable" /><?cs
-		/if ?>
-	</li></ul>
-	</form>
-
-</fieldset>
diff --git a/template/gpgezmlm_convert.cs b/template/gpgezmlm_convert.cs
new file mode 100644
index 0000000..03a8f00
--- /dev/null
+++ b/template/gpgezmlm_convert.cs
@@ -0,0 +1,26 @@
+<div class="title">
+	<h1><?cs var:html_escape(Lang.Title.GpgEzmlmConvert) ?></h1>
+</div>
+
+<div class="introduction">
+	<p><?cs var:html_escape(Lang.Introduction.GpgEzmlmConvert) ?></p>
+</div>
+
+<fieldset>
+	<legend><?cs var:html_escape(Lang.Legend.GpgEzmlmConvert) ?> </legend>
+
+	<?cs call:form_header("gpgezmlm_convert") ?>
+	<ul><li>
+		<?cs if:Data.List.Features.GpgEzmlm
+			?><button type="submit" name="send" value="do"><?cs
+			var:html_escape(Lang.Buttons.GpgEzmlmConvertToPlain) ?></button>
+			<input type="hidden" name="action" value="gpgezmlm_convert_disable" /><?cs
+		else
+			?><button type="submit" name="send" value="do"><?cs
+			var:html_escape(Lang.Buttons.GpgEzmlmConvertToEncrypted) ?></button>
+			<input type="hidden" name="action" value="gpgezmlm_convert_enable" /><?cs
+		/if ?>
+	</li></ul>
+	</form>
+
+</fieldset>
diff --git a/template/nav.cs b/template/nav.cs
index 8a166a7..1b9a674 100644
--- a/template/nav.cs
+++ b/template/nav.cs
@@ -101,14 +101,14 @@
 						"config_subset","processing") ?>"
 					title="<?cs var:html_escape(Lang.Menue.ConfigProcess) ?>"><?cs
 					var:html_escape(Lang.Menue.ConfigProcess) ?></a></li><?cs /if ?>
-			<?cs if:(UI.Navigation.Config.GnupgOptions == 1) &&
-					Data.List.Features.Crypto
-				?><li><a <?cs if:(Data.Action == "config_encryption")
+			<?cs if:(UI.Navigation.Config.GpgEzmlmOptions == 1) &&
+					Data.List.Features.GpgEzmlm
+				?><li><a <?cs if:(Data.Action == "config_gpgezmlm")
 					?> class="nav_active"<?cs /if ?>
 				href="<?cs call:link("list",Data.List.Name,"action","config_ask",
-						"config_subset","encryption") ?>"
-					title="<?cs var:html_escape(Lang.Menue.GnupgOptions) ?>"><?cs
-					var:html_escape(Lang.Menue.GnupgOptions) ?></a></li><?cs /if ?>
+						"config_subset","gpgezmlm") ?>"
+					title="<?cs var:html_escape(Lang.Menue.GpgEzmlmOptions) ?>"><?cs
+					var:html_escape(Lang.Menue.GpgEzmlmOptions) ?></a></li><?cs /if ?>
 			<?cs if:UI.Navigation.Config.Archive == 1
 				?><li><a <?cs if:(Data.Action == "config_archive") ?>
 					class="nav_active"<?cs /if ?>
@@ -132,7 +132,7 @@
 					var:html_escape(Lang.Menue.ConfigAll) ?></a></li><?cs /if ?>
 		</ul></li>
 
-		<?cs if:(subcount(UI.Navigation.Gnupg) > 0) && (Data.List.Features.GpgKeyring)
+		<?cs if:(subcount(UI.Navigation.Gnupg) > 0) && (Data.List.Features.GpgKeyRing)
 				?><li><font class="no_link"><?cs var:html_escape(Lang.Menue.Gnupg)
 				?></font>
 		<ul>
@@ -166,12 +166,12 @@
 					title="<?cs var:html_escape(Lang.Menue.TextFiles) ?>"><?cs
 					var:html_escape(Lang.Menue.TextFiles) ?></a></li><?cs /if ?>
 
-		<?cs if:(UI.Navigation.GnupgConvert == 1) && Config.Features.Crypto
-			?><li><a <?cs if:(Data.Action == "gnupg_convert")
+		<?cs if:(UI.Navigation.GpgEzmlmConvert == 1) && Config.Features.GpgEzmlm
+			?><li><a <?cs if:(Data.Action == "gpgezmlm_convert")
 				?> class="nav_active"<?cs /if ?>
-			href="<?cs call:link("list",Data.List.Name,"action","gnupg_convert_ask","","") ?>"
-				title="<?cs var:html_escape(Lang.Menue.GnupgConvert) ?>"><?cs
-					var:html_escape(Lang.Menue.GnupgConvert) ?></a></li><?cs /if ?>
+			href="<?cs call:link("list",Data.List.Name,"action","gpgezmlm_convert_ask","","") ?>"
+				title="<?cs var:html_escape(Lang.Menue.GpgEzmlmConvert) ?>"><?cs
+					var:html_escape(Lang.Menue.GpgEzmlmConvert) ?></a></li><?cs /if ?>
 		
 		<?cs if:UI.Navigation.SubscribeLog == 1
 			?><li><a <?cs if:(Data.Action == "show_subscription_log")
diff --git a/template/ui/easy.hdf b/template/ui/easy.hdf
index d677196..983deb3 100644
--- a/template/ui/easy.hdf
+++ b/template/ui/easy.hdf
@@ -29,7 +29,7 @@ UI	{
 		TextEdit	= 1
 		ListDelete	= 1
 		SubscribeLog	= 1
-		GnupgConvert	= 1
+		GpgEzmlmConvert	= 1
 		Help	= 1
 	  }
 
diff --git a/template/ui/expert.hdf b/template/ui/expert.hdf
index 546243b..69b9100 100644
--- a/template/ui/expert.hdf
+++ b/template/ui/expert.hdf
@@ -22,7 +22,7 @@ UI	{
 			Subscription	= 1
 			Posting		= 1
 			Processing	= 1
-			GnupgOptions	= 1
+			GpgEzmlmOptions	= 1
 			Archive		= 1
 			Admin		= 1
 			All			= 1
@@ -37,7 +37,7 @@ UI	{
 		TextEdit	= 1
 		ListDelete	= 1
 		SubscribeLog	= 1
-		GnupgConvert	= 1
+		GpgEzmlmConvert	= 1
 		Help	= 1
 	  }
 
@@ -131,9 +131,9 @@ UI	{
 				Path		= mod_post_path
 			  }
 
-			GnupgOptions {
-				SignMessages	= gnupg_sign_messages
-				PlainWithoutKey	= gnupg_plain_without_key
+			GpgEzmlmOptions {
+				SignMessages	= gpgezmlm_signmessages
+				PlainWithoutKey	= gpgezmlm_plainwithoutkey
 			  }
 
 			Processing {
diff --git a/template/ui/normal.hdf b/template/ui/normal.hdf
index 49f5db3..ca62e28 100644
--- a/template/ui/normal.hdf
+++ b/template/ui/normal.hdf
@@ -22,7 +22,7 @@ UI	{
 			Subscription	= 1
 			Posting		= 1
 			Processing	= 1
-			GnupgOptions	= 1
+			GpgEzmlmOptions	= 1
 			Archive		= 1
 			Admin		= 1
 		  }
@@ -36,7 +36,7 @@ UI	{
 		TextEdit	= 1
 		ListDelete	= 1
 		SubscribeLog	= 1
-		GnupgConvert	= 1
+		GpgEzmlmConvert	= 1
 		Help	= 1
 	  }
 
@@ -117,9 +117,9 @@ UI	{
 				MimeReject	= mimereject
 			  }
 
-			GnupgOptions {
-				SignMessages	= gnupg_sign_messages
-				PlainWithoutKey	= gnupg_plain_without_key
+			GpgEzmlmOptions {
+				SignMessages	= gpgezmlm_signmessages
+				PlainWithoutKey	= gpgezmlm_nokeynocrypt
 			  }
 
 			Processing {