diff --git a/classes/Notice.php b/classes/Notice.php
index b6f480ed5e..f2a746a844 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -2101,6 +2101,18 @@ class Notice extends Managed_DataObject
                            $author->getNickname(),
                            $this->content);
 
+        $maxlen = self::maxContent();
+        if ($maxlen > 0 && mb_strlen($content) > $maxlen) {
+            // Web interface and current Twitter API clients will
+            // pull the original notice's text, but some older
+            // clients and RSS/Atom feeds will see this trimmed text.
+            //
+            // Unfortunately this is likely to lose tags or URLs
+            // at the end of long notices.
+            $content = mb_substr($content, 0, $maxlen - 4) . ' ...';
+        }     
+
+
         // Scope is same as this one's
         return self::saveNew($repeater->id,
                              $content,