diff --git a/emails.py b/emails.py
index fea03fb..a7db528 100755
--- a/emails.py
+++ b/emails.py
@@ -136,8 +136,8 @@ except:
 ###############################################################################
 
 # Is this a request for subscription?
-request_subscribe   = email_subject.upper('SUBSCRIBE')
-request_unsubscribe = email_subject.upper('UNSUBSCRIBE')
+request_subscribe   = email_subject.upper('SUBSCRIBE')   and len(email_body) == 0
+request_unsubscribe = email_subject.upper('UNSUBSCRIBE') and len(email_body) == 0
 
 if request_subscribe:
     # Already subscribed?
@@ -148,7 +148,7 @@ if request_subscribe:
     subscribers.append(email_from[1])
     commit_message = 'Subscribe'
 
-if request_unsubscribe
+if request_unsubscribe:
     # Already unsubscribed?
     if email_from[1] not in subscribers:
         logging.info('{} already unsubscribed from {}'.format(email_from, repository_path))
@@ -192,7 +192,7 @@ if request_subscribe or request_unsubscribe:
 # for the thread. Otherwise, we will create a new tree.
 ###############################################################################
 
-if not email_body or len(email_body) == 0:
+if len(email_body) == 0:
     logging.info('Refuting email without plaintext body: {}'.format(email_subject))
     exit()