diff --git a/appinfo/database.xml b/appinfo/database.xml
index 923e50c6..004cd33e 100644
--- a/appinfo/database.xml
+++ b/appinfo/database.xml
@@ -27,7 +27,7 @@
 				<type>text</type>
 				<default></default>
 				<notnull>true</notnull>
-				<length>140</length>
+				<length>4096</length>
 			</field>
 			<field>
 				<name>user_id</name>
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 4a1a744c..4ff78f9a 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -6,7 +6,7 @@
 	<licence>AGPL</licence>
 	<author>Arthur Schiwon, Marvin Thomas Rabe, Stefan Klemm</author>
 	<standalone/>
-	<version>0.8</version>
+	<version>0.8.1</version>
 	<documentation>
             <user>https://doc.owncloud.org/server/9.0/user_manual/bookmarks.html</user>
         </documentation>
diff --git a/controller/lib/bookmarks.php b/controller/lib/bookmarks.php
index 8cc32570..e0fe4660 100644
--- a/controller/lib/bookmarks.php
+++ b/controller/lib/bookmarks.php
@@ -434,6 +434,10 @@ class Bookmarks {
 		}
 		$enc_url_noprefix = htmlspecialchars_decode($url_without_prefix);
 		$enc_url = htmlspecialchars_decode($url);
+
+		$title = mb_substr($title, 0, 4096);
+		$description = mb_substr($description, 0, 4096);
+
 		// Change lastmodified date if the record if already exists
 		$sql = "SELECT * from  `*PREFIX*bookmarks` WHERE `url` like ? AND `user_id` = ?";
 		$query = $db->prepareQuery($sql, 1);