diff --git a/en_US.ISO8859-1/books/handbook/mail/chapter.sgml b/en_US.ISO8859-1/books/handbook/mail/chapter.sgml
index 9bcfd58b57..e37c776f08 100644
--- a/en_US.ISO8859-1/books/handbook/mail/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/mail/chapter.sgml
@@ -554,7 +554,7 @@ procmail: "|/usr/local/bin/procmail"</programlisting>
 	list.  Mail to the mailbox <username>ftp-bugs</username> is
 	expanded to the three local mailboxes <username>joe</username>,
 	<username>eric</username>, and <username>paul</username>.  Note
-	that a remote mailbox could be specified as <literal>user@example.com</literal>.  The
+	that a remote mailbox could be specified as <email>user@example.com</email>.  The
 	next example shows writing mail to a file, in this case
 	<filename>/dev/null</filename>.  The last example shows sending
 	mail to a program, in this case the mail message is written to the
@@ -628,8 +628,8 @@ postmaster@example.com          postmaster@noc.example.net
     <para>In the above example, we have a mapping for a domain
       <hostid role="domainname">example.com</hostid>.  This file is processed in a
       first match order down the file.  The first item maps
-      <literal>root@example.com</literal> to the local mailbox <username>root</username>.  The next entry maps
-      <literal>postmaster@example.com</literal> to the mailbox <username>postmaster</username> on the host
+      <email>root@example.com</email> to the local mailbox <username>root</username>.  The next entry maps
+      <email>postmaster@example.com</email> to the mailbox <username>postmaster</username> on the host
       <hostid role="fqdn">noc.example.net</hostid>.  Finally, if nothing from <hostid role="domainname">example.com</hostid> has
       matched so far, it will match the last mapping, which matches
       every other mail message addressed to someone at
@@ -1174,7 +1174,7 @@ example.FreeBSD.org
 example.FreeBSD.org has address 204.216.27.XX</screen>
 
       <para>If that is what you see, mail directly to
-        <email>yourlogin@example.FreeBSD.org</email> should work without
+        <email role="nolink">yourlogin@example.FreeBSD.org</email> should work without
         problems (assuming <application>sendmail</application> is
         running correctly on <hostid role="fqdn">example.FreeBSD.org</hostid>).</para>
 
@@ -1570,8 +1570,8 @@ hostname=_HOSTNAME_</programlisting>
     <para>In order to send mail with the correct
       <literal>from:</literal> header, you must tell
       <application>sendmail</application> to use
-      <literal>user@example.net</literal> rather than
-      <literal>user@bsd.home</literal>. You may also wish to tell
+      <email>user@example.net</email> rather than
+      <email role="nolink">user@bsd.home</email>. You may also wish to tell
       <application>sendmail</application> to send all mail via <hostid
       role="fqdn">relay.example.net</hostid>, allowing quicker mail
       transmission.</para>
@@ -2241,21 +2241,21 @@ user "john", with password "XXXXX", is "myth" here;</programlisting>
     <para>The majority of these rules can also be found in the
       &man.procmailex.5; manual page.</para>
 
-    <para>Forward all mail from <literal>user@example.com</literal> to an
-      external address of <literal>goodmail@example2.com</literal>:</para>
+    <para>Forward all mail from <email>user@example.com</email> to an
+      external address of <email role="nolink">goodmail@example2.com</email>:</para>
 
     <programlisting>:0
 * ^From.*user@example.com
 ! goodmail@example2.com</programlisting>
 
     <para>Forward all mails shorter than 1000 bytes to an external
-      address of <literal>goodmail@example2.com</literal>:</para>
+      address of <email role="nolink">goodmail@example2.com</email>:</para>
 
     <programlisting>:0
 * < 1000
 ! goodmail@example2.com</programlisting>
 
-    <para>Send all mail sent to <literal>alternate@example.com</literal>
+    <para>Send all mail sent to <email>alternate@example.com</email>
       into a mailbox called <filename>alternate</filename>:</para>
 
     <programlisting>:0