diff --git a/build.gradle b/build.gradle
index 669e0bc..2a4c05e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -43,8 +43,7 @@ repositories {
 }
 
 dependencies {
-    compile 'com.github.owncloud:android-library:oc-android-library-0.9.10'
-
+    compile project(':owncloudAndroidLibrary')
     compile 'com.android.support:support-v13:23.1.1'
     compile 'com.android.support:appcompat-v7:23.1.1'
     compile 'com.android.support:design:23.1.1'
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index d289b13..787ec33 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="fr.unix_experience.owncloud_sms"
           xmlns:android="http://schemas.android.com/apk/res/android"
-          android:versionCode="35"
-          android:versionName="0.21.0"> <!-- From Android 4.0 to 6.0 -->
+          android:versionCode="36"
+          android:versionName="0.21.1"> <!-- From Android 4.0 to 6.0 -->
     <uses-sdk
         android:maxSdkVersion="23"
         android:minSdkVersion="14"
diff --git a/src/main/java/fr/unix_experience/owncloud_sms/notifications/OCSMSNotificationUI.java b/src/main/java/fr/unix_experience/owncloud_sms/notifications/OCSMSNotificationUI.java
index 4ae17e1..3335aaa 100644
--- a/src/main/java/fr/unix_experience/owncloud_sms/notifications/OCSMSNotificationUI.java
+++ b/src/main/java/fr/unix_experience/owncloud_sms/notifications/OCSMSNotificationUI.java
@@ -43,7 +43,7 @@ public class OCSMSNotificationUI {
         final Bitmap picture = BitmapFactory.decodeResource(res, R.drawable.ic_launcher);
 
 
-        final String ticker = titleString.substring(0, 20);
+        final String ticker = (titleString.length() > 20) ? titleString.substring(0, 20) : titleString;
         final String title = res.getString(R.string.ui_notification_title_template, titleString);
 
         final NotificationCompat.Builder builder = new NotificationCompat.Builder(context)