diff --git a/check.py b/check.py
index b1656b6..f5e1501 100755
--- a/check.py
+++ b/check.py
@@ -28,11 +28,17 @@ def signcheck(data):
     yield MailTest("Those tests are limited to signature checking. THIS IS NOT THE SUBMISSION INTERFACE.", 2)
     yield data
 
+def relatesTo(data, submissions_dir):
+    yield MailTest("This is the submission interface for %s." % os.path.basename(submissions_dir), -1)
+    yield data
+
 
 def gen_checks(submissions_dir, check_content=False, check_submission_hash=None):
-    if HARD_MAX_SUBMISSION is not None and check_content:
-        yield (late.check, [HARD_MAX_SUBMISSION, SOFT_MAX_SUBMISSION])
-    elif not check_content:
+    if check_content:
+        yield (relatesTo, [submissions_dir])
+        if HARD_MAX_SUBMISSION is not None:
+            yield (late.check, [HARD_MAX_SUBMISSION, SOFT_MAX_SUBMISSION])
+    else:
         yield signcheck
     yield (envelope.check, [GNUPG_DIRECTORY, BETA])
     yield (signature.check, [GNUPG_DIRECTORY])