diff --git a/src/Text/Pandoc/GroffChar.hs b/src/Text/Pandoc/GroffChar.hs
index 6d2eff98b..3f78939c4 100644
--- a/src/Text/Pandoc/GroffChar.hs
+++ b/src/Text/Pandoc/GroffChar.hs
@@ -37,7 +37,8 @@ module Text.Pandoc.GroffChar (
   ) where
 import Prelude
 
--- | These are the escapes specifically mentioned in groff_man(7).
+-- | These are the escapes specifically mentioned in groff_man(7),
+-- plus @ and ellipsis.
 standardEscapes :: [(Char, String)]
 standardEscapes =
   [ ('\160', "\\ ")
@@ -54,6 +55,7 @@ standardEscapes =
   , ('~', "\\[ti]")
   , ('-', "\\-")  -- minus; - will be interpreted as hyphen U+2010
   , ('\\', "\\[rs]")
+  , ('@', "\\[at]") -- because we use @ as a table and math delimiter
   , ('\x2026', "\\&...")  -- because u2026 doesn't render on tty
   ]
 
diff --git a/test/writer.ms b/test/writer.ms
index 0cb60a3bc..2afeb6ae2 100644
--- a/test/writer.ms
+++ b/test/writer.ms
@@ -925,7 +925,7 @@ It should.
 .LP
 An e\-mail address: \c
 .pdfhref W -D "mailto:nobody%40nowhere.net" -A "\c" \
- -- "nobody@nowhere.net"
+ -- "nobody\[at]nowhere.net"
 \&
 .RS
 .LP