diff --git a/UI/Common/UIxFolderActions.m b/UI/Common/UIxFolderActions.m
index 7878f19cf..e8e0fe5bc 100644
--- a/UI/Common/UIxFolderActions.m
+++ b/UI/Common/UIxFolderActions.m
@@ -1,6 +1,6 @@
 /* UIxFolderActions.m - this file is part of SOGo
  *
- * Copyright (C) 2007 Inverse inc.
+ * Copyright (C) 2007-2010 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
diff --git a/UI/Contacts/UIxContactFoldersView.m b/UI/Contacts/UIxContactFoldersView.m
index d1dc583aa..040b6b207 100644
--- a/UI/Contacts/UIxContactFoldersView.m
+++ b/UI/Contacts/UIxContactFoldersView.m
@@ -1,6 +1,6 @@
 /* UIxContactFoldersView.m - this file is part of SOGo
  *
- * Copyright (C) 2006-2009 Inverse inc.
+ * Copyright (C) 2006-2010 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
diff --git a/UI/Contacts/UIxContactsUserFolders.m b/UI/Contacts/UIxContactsUserFolders.m
index a7485b210..1ff941edf 100644
--- a/UI/Contacts/UIxContactsUserFolders.m
+++ b/UI/Contacts/UIxContactsUserFolders.m
@@ -1,6 +1,6 @@
 /* UIxContactsUserFolders.m - this file is part of SOGo
  *
- * Copyright (C) 2007 Inverse inc.
+ * Copyright (C) 2007-2010 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
diff --git a/UI/MailPartViewers/French.lproj/Localizable.strings b/UI/MailPartViewers/French.lproj/Localizable.strings
index bbd27b084..3baf88240 100644
--- a/UI/MailPartViewers/French.lproj/Localizable.strings
+++ b/UI/MailPartViewers/French.lproj/Localizable.strings
@@ -22,7 +22,7 @@ request_info = "vous invite à une réunion.";
 "Update status" = "Intégrer les modifications";
 Accept = "Accepter";
 Decline = "Decliner";
-Tentative = "Tentative";
+Tentative = "Tentatif";
 "Delegate ..." = "Déléguer ...";
 "Delegated to" = "Délégué à";
 "Update status in calendar" = "Mettre l'agenda à jour";
diff --git a/UI/Scheduler/French.lproj/Localizable.strings b/UI/Scheduler/French.lproj/Localizable.strings
index 210a9ea2a..1b461afb4 100644
--- a/UI/Scheduler/French.lproj/Localizable.strings
+++ b/UI/Scheduler/French.lproj/Localizable.strings
@@ -318,7 +318,7 @@
 /* status type */
 "status_" = "Non-spécifié";
 "status_NOT-SPECIFIED" = "Non spécifié";
-"status_TENTATIVE" = "Tentative";
+"status_TENTATIVE" = "Tentatif";
 "status_CONFIRMED" = "Confirmé";
 "status_CANCELLED" = "Annulé";
 "status_NEEDS-ACTION" = "En attente";
@@ -470,7 +470,7 @@ validate_endbeforestart    = "La date de fin est avant la date de début.";
 "Needs action" = "En attente";
 "Accepted" = "Accepté";
 "Declined" = "Décliné";
-"Tentative" = "Tentative";
+"Tentative" = "Tentatif";
 
 "Free" = "Libre";
 "Busy" = "Occupé";
diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index aded2c8fe..b8942ddc7 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -1311,7 +1311,7 @@ function dropSelectedContacts (action, toId) {
             }
         }
         var fromId = $(selectedFolders[0]).id;
-        if (!currentFolderIsRemote () || action != "move") {
+        if (!currentFolderIsRemote () && fromId.substring(1) != toId) {
             var url = ApplicationBaseURL + fromId + "/" + action 
               + "?folder=" + toId + "&uid="
               + contactIds.join("&uid=");