diff --git a/src/Content/Text/Plaintext.php b/src/Content/Text/Plaintext.php
index ef2337faf4..af8e9c00fe 100644
--- a/src/Content/Text/Plaintext.php
+++ b/src/Content/Text/Plaintext.php
@@ -303,7 +303,7 @@ class Plaintext
 				$limit += mb_strlen(trim($word)) - self::URL_LENGTH;
 			}
 
-			if ((mb_strlen($part . $word) > $limit - 8) && (mb_strlen($part . $word . $message) > $limit)) {
+			if ((mb_strlen($part . $word) > $limit - 8) && ($parts || (mb_strlen($part . $word . $message) > $limit))) {
 				$parts[] = trim($part);
 				$part    = '';
 				$limit   = $baselimit;
diff --git a/src/Model/Item.php b/src/Model/Item.php
index 921d35882d..3b9477fc31 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1628,7 +1628,7 @@ class Item
 
 		if (($uid != 0) && (($item['gravity'] == self::GRAVITY_PARENT) || $is_reshare) &&
 			DI::pConfig()->get($uid, 'system', 'accept_only_sharer') == self::COMPLETION_NONE &&
-			!in_array($item['post-reason'], [self::PR_FOLLOWER, self::PR_TAG, self::PR_TO, self::PR_CC])) {
+			!in_array($item['post-reason'], [self::PR_FOLLOWER, self::PR_TAG, self::PR_TO, self::PR_CC, self::PR_ACTIVITY])) {
 			Logger::info('Contact is not a follower, thread will not be stored', ['author' => $item['author-link'], 'uid' => $uid, 'uri-id' => $uri_id, 'post-reason' => $item['post-reason']]);
 			return 0;
 		}