diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/StatusUpload.java b/app/src/main/java/org/nuclearfog/twidda/backend/StatusUpload.java
index 3ace41e3..90157747 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/StatusUpload.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/StatusUpload.java
@@ -102,7 +102,7 @@ public class StatusUpload extends AsyncTask<String, Void, Boolean> {
                         .setPositiveButton(R.string.retry, new OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
-                                ui.get().send();
+                                ui.get().findViewById(R.id.sendTweet).callOnClick();
                             }
                         })
                         .setNegativeButton(R.string.cancel, null).show();
diff --git a/app/src/main/java/org/nuclearfog/twidda/window/TweetPopup.java b/app/src/main/java/org/nuclearfog/twidda/window/TweetPopup.java
index e94b7542..08c4f43b 100644
--- a/app/src/main/java/org/nuclearfog/twidda/window/TweetPopup.java
+++ b/app/src/main/java/org/nuclearfog/twidda/window/TweetPopup.java
@@ -14,6 +14,7 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.EditText;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.backend.ImagePopup;
@@ -116,7 +117,18 @@ public class TweetPopup extends AppCompatActivity implements OnClickListener {
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.sendTweet:
-                send();
+                String tweetStr = tweet.getText().toString();
+                sendTweet = new StatusUpload(this, tweetStr, inReplyId);
+
+                if (!tweetStr.trim().isEmpty() && mediaPath.isEmpty()) {
+                    sendTweet.execute();
+                } else if (!mediaPath.isEmpty()) {
+                    String[] paths = new String[mediaPath.size()];
+                    paths = mediaPath.toArray(paths);
+                    sendTweet.execute(paths);
+                } else {
+                    Toast.makeText(this, R.string.empty_tweet, Toast.LENGTH_SHORT).show();
+                }
                 break;
 
             case R.id.close:
@@ -154,21 +166,6 @@ public class TweetPopup extends AppCompatActivity implements OnClickListener {
     }
 
 
-    public void send() {
-        String tweetStr = tweet.getText().toString();
-        String[] paths = new String[mediaPath.size()];
-        paths = mediaPath.toArray(paths);
-        sendTweet = new StatusUpload(this, tweetStr, inReplyId);
-        if (!tweetStr.trim().isEmpty() || paths.length > 0) {
-            if (inReplyId > 0) {
-                sendTweet.execute(paths);
-            } else {
-                sendTweet.execute();
-            }
-        }
-    }
-
-
     private void getMedia() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             int check = checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE);
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index bc0c3143..5963c345 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -67,4 +67,5 @@
     <string name="cancel_message">Nachricht verwerfen?</string>
     <string name="error_not_specified">Allgemeiner Fehler!</string>
     <string name="error_sending_dm">Fehler beim Senden der Direktnachricht!</string>
+    <string name="empty_tweet">Tweet leer!</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 168919a5..4ce727fc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -75,4 +75,5 @@
     <string name="cancel_message">cancel message?</string>
     <string name="error_not_specified">not specidfied error!</string>
     <string name="error_sending_dm">error while sending direct message!</string>
+    <string name="empty_tweet">empty tweet!</string>
 </resources>
\ No newline at end of file