diff --git a/source/java/org/alfresco/filesys/smb/server/repo/CifsHelper.java b/source/java/org/alfresco/filesys/smb/server/repo/CifsHelper.java
index b910f0939d..8a49c82798 100644
--- a/source/java/org/alfresco/filesys/smb/server/repo/CifsHelper.java
+++ b/source/java/org/alfresco/filesys/smb/server/repo/CifsHelper.java
@@ -507,13 +507,14 @@ public class CifsHelper
                 String mimetype = mimetypeService.guessMimetype(tempName);
                 oldContentData = ContentData.setMimetype(null, mimetype);
             }
-            ContentData newContentData = fileToMoveInfo.getContentData();
-            if (newContentData == null)
-            {
-                String mimetype = mimetypeService.guessMimetype(newName);
-                newContentData = ContentData.setMimetype(null, mimetype);
-            }
             
+            ContentData newContentData = fileToMoveInfo.getContentData();
+
+            // Reset the mime type
+            
+            String mimetype = mimetypeService.guessMimetype(newName);
+            newContentData = ContentData.setMimetype(newContentData, mimetype);
+
             nodeService.setProperty(tempNodeRef, ContentModel.PROP_CONTENT, newContentData);
             nodeService.setProperty(nodeToMoveRef, ContentModel.PROP_CONTENT, oldContentData);
         }