diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java b/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java
index 24592443..1f42d40a 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java
@@ -127,10 +127,10 @@ public class StatusLoader extends AsyncTask<Long, Void, Void> {
                 case RETWEET:
                     tweet = mTwitter.retweet(TWEETID);
                     publishProgress();
-                    database.updateStatus(tweet);
 
                     if (!tweet.retweeted())
                         database.removeRetweet(TWEETID);
+                    database.updateStatus(tweet);
                     break;
 
                 case FAVORITE:
diff --git a/app/src/main/java/org/nuclearfog/twidda/database/DatabaseAdapter.java b/app/src/main/java/org/nuclearfog/twidda/database/DatabaseAdapter.java
index d9011d47..cdc15972 100644
--- a/app/src/main/java/org/nuclearfog/twidda/database/DatabaseAdapter.java
+++ b/app/src/main/java/org/nuclearfog/twidda/database/DatabaseAdapter.java
@@ -391,7 +391,7 @@ public class DatabaseAdapter {
         if (tweet != null) {
             SQLiteDatabase db = getDbWrite();
             long retweetedId = tweet.getMyRetweetId();
-            db.delete("tweet", "retweeterID=" + retweetedId, null);
+            db.delete("tweet", "tweetID=" + retweetedId, null);
             commit(db);
         }
     }