Index: camel/providers/local/camel-local-store.c
===================================================================
--- camel/providers/local/camel-local-store.c	(revision 9055)
+++ camel/providers/local/camel-local-store.c	(working copy)
@@ -324,23 +324,9 @@
 			ret = -1;
 		}
 #ifndef G_OS_WIN32
-	} else if (S_ISDIR(st.st_mode)) { /* use rename for dirs */
-		if (rename(old, new) == 0
-		    || stat(new, &st) == 0) {
-			ret = 0;
-		} else {
-			err = errno;
-			ret = -1;
-		}
-	} else if (link(old, new) == 0 /* and link for files */
-		   || (stat(new, &st) == 0 && st.st_nlink == 2)) {
-		if (unlink(old) == 0) {
-			ret = 0;
-		} else {
-			err = errno;
-			unlink(new);
-			ret = -1;
-		}
+	 } if (rename(old, new) == 0
+	    || stat(new, &st) == 0) {
+		ret = 0;
 	} else {
 		err = errno;
 		ret = -1;
