diff --git a/.idea/misc.xml b/.idea/misc.xml
index ba7052b8..635999df 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -24,7 +24,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index ed95fc2e..8b9e0497 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,11 +15,6 @@ android {
         release {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
-        debug {
-            zipAlignEnabled false
-        }
-    }
-    productFlavors {
     }
 }
 
@@ -28,8 +23,9 @@ dependencies {
     compile 'com.android.support:appcompat-v7:26+'
     compile 'com.android.support:design:26+'
     compile(name: 'colorpicker', ext: 'aar')
-    compile files('libs/twitter4j-core-4.0.4.jar')
     implementation files('libs/picasso-2.5.2.jar')
+    implementation files('libs/twitter4j-core-4.0.6.jar')
+    implementation files('libs/twitter4j-core-4.0.6-sources.jar')
 }
 
 repositories {
diff --git a/app/libs/twitter4j-core-4.0.4.jar b/app/libs/twitter4j-core-4.0.4.jar
deleted file mode 100644
index 029abce2..00000000
Binary files a/app/libs/twitter4j-core-4.0.4.jar and /dev/null differ
diff --git a/app/libs/twitter4j-core-4.0.6-sources.jar b/app/libs/twitter4j-core-4.0.6-sources.jar
new file mode 100644
index 00000000..a709d502
Binary files /dev/null and b/app/libs/twitter4j-core-4.0.6-sources.jar differ
diff --git a/app/libs/twitter4j-core-4.0.6.jar b/app/libs/twitter4j-core-4.0.6.jar
new file mode 100644
index 00000000..a1f86cce
Binary files /dev/null and b/app/libs/twitter4j-core-4.0.6.jar differ
diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/TwitterEngine.java b/app/src/main/java/org/nuclearfog/twidda/backend/TwitterEngine.java
index b353e6ab..605cb365 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/TwitterEngine.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/TwitterEngine.java
@@ -100,6 +100,7 @@ public class TwitterEngine {
         ConfigurationBuilder builder = new ConfigurationBuilder();
         builder.setOAuthConsumerKey(TWITTER_CONSUMER_KEY);
         builder.setOAuthConsumerSecret(TWITTER_CONSUMER_SECRET);
+        builder.setTweetModeExtended(true);
         AccessToken token = new AccessToken(key1,key2);
         twitter = new TwitterFactory( builder.build() ).getInstance(token);
     }
@@ -369,7 +370,7 @@ public class TwitterEngine {
     public void retweet(long id, boolean active) throws TwitterException {
         if(!active) {
             twitter.retweetStatus(id);
-        }//TODO remove Retweet
+        }
         else {
             deleteTweet(id);
         }