diff --git a/template/mailbox-description.php b/template/mailbox-description.php
index 3ccc06d..2493515 100644
--- a/template/mailbox-description.php
+++ b/template/mailbox-description.php
@@ -1,49 +1,36 @@
 <?php
 # Copyright (C) 2018, 2019 Valerio Bozzolan
 # Boz Libre Hosting Panel
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
 # License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU Affero General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 /*
  * This is the template for a single e-mail forwarding
  *
  * Called from:
  * 	template/mailbox.php
  *
  * Variables:
  *  $mailbox object|null Mailbox
  */
 
 // you can override from your 'load.php' configuration file your own instructions. For now, I just set my own one :)
 // just define this constant with the 'define' standard function.
 define_default( 'MAILBOX_INSTRUCTIONS', 'https://mail.reyboz.it/?&email=%s' );
 
 // unuseful when load directly
 defined( 'BOZ_PHP' ) or die;
 ?>
 
 	<p><?= esc_html( __( "A mailbox is a fully operative e-mail address that you can use to send and receive e-mails. As interface you can use a webmail, an e-mail client like Thunderbird, Evolution, or a mobile app like K-9 Mail, etc." ) ) ?></p>
-
-	<!-- mailbox instructions -->
-	<?php if( $mailbox ): ?>
-		<!-- TODO: create a dedicated template for this, to allow easy override of just this -->
-		<p><?= HTML::a(
-			sprintf(
-				MAILBOX_INSTRUCTIONS,
-				urlencode( $mailbox->getMailboxPermalink( true ) )
-			),
-			esc_html( __( "How to configure your e-mail client" ) )
-		) ?></p>
-	<?php endif ?>
-	<!-- /mailbox instructions -->
diff --git a/template/mailbox-documentation.php b/template/mailbox-documentation.php
new file mode 100644
index 0000000..7d70f73
--- /dev/null
+++ b/template/mailbox-documentation.php
@@ -0,0 +1,38 @@
+<?php
+# Copyright (C) 2018, 2019, 2020 Valerio Bozzolan
+# KISS Libre Hosting Panel
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+/*
+ * This is the template for some mailbox instructions
+ *
+ * Called from:
+ * 	template/mailbox.php
+ *
+ * Available variables:
+ * 	$mailbox object
+ */
+
+// do not load directly
+defined( 'BOZ_PHP' ) or die;
+?>
+	<h3><?= __( "Documentation" ) ?></h3>
+	<ul>
+		<li>
+			<a href="https://mail.reyboz.it?email=<?= urlencode( $mailbox->getMailboxAddress() ) ?>" target="_blank" />
+				<?= __( "How to setup your IMAP/SMTP client" ) ?>
+			</a>
+		</li>
+	</ul>
diff --git a/template/mailbox.php b/template/mailbox.php
index 86ab756..112dd5b 100644
--- a/template/mailbox.php
+++ b/template/mailbox.php
@@ -1,81 +1,78 @@
 <?php
 # Copyright (C) 2018, 2019, 2020 Valerio Bozzolan
 # KISS Libre Hosting Panel
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
 # License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU Affero General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 /*
  * This is the template for a mailbox
  *
  * Called from:
  * 	www/mailbox.php
  *
  * Available variables:
  * 	$mailbox object
  * 	$domain  object
  *      $plan    object
  * 	$mailbox_password string|null
  */
 
 // unuseful when load directly
 defined( 'BOZ_PHP' ) or die;
 ?>
 
 	<!-- start description -->
 	<?php template( 'mailbox-description', [
 		'mailbox' => $mailbox,
 	] ) ?>
 	<!-- end description -->
 
 	<!-- start stats -->
 	<?php template( 'mailbox-stats', [
 		'mailbox' => $mailbox,
 		'plan'    => $plan,
 	] ) ?>
 	<!-- end stats -->
 
-	<!-- resources -->
+	<!-- start documentation -->
 	<?php if( $mailbox ): ?>
-		<h3><?= __( "Resources" ) ?></h3>
-		<ul>
-			<li>
-				<a href="https://mail.reyboz.it?email=<?= urlencode( $mailbox->getMailboxAddress() ) ?>" target="_blank" />
-					<?= __( "How to setup your IMAP/SMTP client" ) ?>
-				</a>
-			</li>
-		</ul>
+
+		<?php template( 'mailbox-documentation', [
+			'mailbox' => $mailbox,
+		] ) ?>
+
 	<?php endif ?>
-	<!-- /resources -->
+	<!-- end documentation -->
 
 	<?php if( $mailbox ): ?>
 		<h3><?= __( "Actions" ) ?></h3>
 		<form method="post">
 			<?php form_action( 'mailbox-password-reset' ) ?>
 			<?php if( $mailbox_password ): ?>
 				<label for="password"><?= __( "Please copy your new password:" ) ?><br />
 				<input type="text" id="password" readonly<?= value( $mailbox_password ) ?> />
 			<?php else: ?>
 				<p><button type="submit" class="btn btn-default"><?= __( "Generate new password" ) ?></button></p>
 			<?php endif ?>
 		</form>
 	<?php else: ?>
 		<form method="post">
 			<?php form_action( 'mailbox-create' ) ?>
 			<p><label for="mailbox-username"><?= __( "Mailbox name:" ) ?></label><br />
 				<input type="text" name="mailbox_username" id="mailbox-username" length="64" /> @ <?= esc_html( $domain->getDomainName() ) ?>
 			</p>
 			<p><button type="submit" class="btn btn-default"><?= __( "Create" ) ?></button></p>
 		</form>
 	<?php endif ?>
 	<!-- /actions -->