diff --git a/src/Content/Text/Plaintext.php b/src/Content/Text/Plaintext.php
index 75fdf2b2b..1e76a557b 100644
--- a/src/Content/Text/Plaintext.php
+++ b/src/Content/Text/Plaintext.php
@@ -223,8 +223,6 @@ class Plaintext
 						unset($post['url']);
 					}
 				}
-			} elseif ($link != '') {
-				$complete_msg .= "\n" . $link;
 			}
 		}
 
@@ -240,6 +238,12 @@ class Plaintext
 				$limit = $limit - 23;
 			}
 
+			if (!in_array($link, ['', $item['plink']]) && ($post['type'] != 'photo')) {
+				$complete_msg .= "\n" . $link;
+			}
+
+			$post['parts'] = self::getParts(trim($complete_msg), $limit);
+
 			if (iconv_strlen($msg, 'UTF-8') > $limit) {
 				if (($post['type'] == 'text') && isset($post['url'])) {
 					$post['url'] = $item['plink'];
@@ -255,10 +259,6 @@ class Plaintext
 			}
 		}
 
-		if ($limit > 0) {
-			$post['parts'] = self::getParts(trim($complete_msg), $limit);
-		}
-
 		$post['text'] = trim($msg);
 
 		return $post;