diff --git a/app/Classes/Page.php b/app/Classes/Page.php
index f655a5d..f78cff3 100644
--- a/app/Classes/Page.php
+++ b/app/Classes/Page.php
@@ -332,13 +332,13 @@ class Page
 							$subtext = substr($this->text,$current_pos,$space_pos);
 						}
 
-					// If the reset of the string will fit on the current line
-					} elseif ($text_length-$current_pos < static::MSG_WIDTH-$buffer) {
+					// If the rest of the string will fit on the current line
+					} elseif ($text_length-$current_pos < static::MSG_WIDTH-$this->x-$buffer) {
 						$subtext = substr($this->text,$current_pos);
 
 					// Get the next lines worth of chars, breaking on a space
 					} else {
-						$subtext = $this->text_substr(substr($this->text,$current_pos),static::MSG_WIDTH-$buffer);
+						$subtext = $this->text_substr(substr($this->text,$current_pos),static::MSG_WIDTH-$this->x-$buffer);
 
 						// Include the text up to the last space
 						if (substr($this->text,$current_pos+strlen($subtext),1) !== ' ')