diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index 327854ccdc..1aa789e7e7 100755
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -176,6 +176,10 @@ class XMPPDaemon {
 			$this->log(LOG_INFO, 'Ignoring OTR from ' . $from);
 			return;
 		} else {
+			if(strlen($pl['body'])>140) {
+				$this->from_site($from, 'Message too long - maximum is 140 characters, you sent ' . strlen($pl['body']));
+				return;
+			}
 			$this->add_notice($user, $pl);
 		}
 	}