diff --git a/docs/setup.rst b/docs/setup.rst
index 9f52143df..ef6c33468 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -269,7 +269,7 @@ Vagrant Method
       dumped to be consumed by Paperless.
     * ``PAPERLESS_PASSPHRASE``: this is the passphrase Paperless uses to
       encrypt/decrypt the original document.
-    * ``PAPERLESS_SHARED_SECRET``: this is the "magic word" used when consuming
+    * ``PAPERLESS_EMAIL_SECRET``: this is the "magic word" used when consuming
       documents from mail or via the API.  If you don't use either, leaving it
       blank is just fine.
 
diff --git a/src/documents/mail.py b/src/documents/mail.py
index a0aa2d850..d2828a57c 100644
--- a/src/documents/mail.py
+++ b/src/documents/mail.py
@@ -42,10 +42,7 @@ class Message(Loggable):
     and n attachments, and that we don't care about the message body.
     """
 
-    SECRET = os.getenv(
-        "PAPERLESS_EMAIL_SECRET",
-        os.getenv("PAPERLESS_SHARED_SECRET")  # TODO: Remove after 2017/09
-    )
+    SECRET = os.getenv("PAPERLESS_EMAIL_SECRET")
 
     def __init__(self, data, group=None):
         """