diff --git a/src/lib/platform/CMSWindowsScreen.cpp b/src/lib/platform/CMSWindowsScreen.cpp
index 6a5b5f4a..d30674ac 100644
--- a/src/lib/platform/CMSWindowsScreen.cpp
+++ b/src/lib/platform/CMSWindowsScreen.cpp
@@ -38,6 +38,8 @@
 #include "CArchMiscWindows.h"
 #include "CApp.h"
 #include "CArgsBase.h"
+#include "CClientApp.h"
+#include "CClient.h"
 #include <string.h>
 #include <pbt.h>
 #include <Shlobj.h>
@@ -126,8 +128,9 @@ CMSWindowsScreen::CMSWindowsScreen(
 	try {
 		if (m_isPrimary && !m_noHooks) {
 			m_hookLibrary = openHookLibrary("synwinhk");
-			m_shellLibrary = openShellLibrary("synwinxt");
 		}
+		m_shellLibrary = openShellLibrary("synwinxt");
+
 		m_screensaver = new CMSWindowsScreenSaver();
 		m_desks       = new CMSWindowsDesks(
 							m_isPrimary, m_noHooks,
@@ -359,6 +362,26 @@ CMSWindowsScreen::leave()
 	forceShowCursor();
 
 	if (m_draggingStarted) {
+		CString& draggingDir = getDraggingFileDir();
+		LOG((CLOG_DEBUG "get dragging file dir: %s", draggingDir.c_str()));
+		size_t size = draggingDir.size();
+
+		if (!m_isPrimary) {
+			// TODO: fake these keys properly
+			fakeKeyDown(kKeyEscape, 8192, 1);
+			fakeKeyUp(1);
+
+			fakeMouseButton(kButtonLeft, false);
+
+			CClientApp& app = CClientApp::instance();
+			CClient* client = app.getClientPtr();
+			UInt32 fileCount = 1;
+			LOG((CLOG_DEBUG "send dragging info to server: %s", draggingDir.c_str()));
+			client->draggingInfoSending(fileCount, draggingDir, size);
+			LOG((CLOG_DEBUG "send dragging file to server"));
+			client->sendFileToServer(draggingDir.c_str());
+		}
+
 		m_draggingStarted = false;
 	}
 	
@@ -708,12 +731,26 @@ void
 CMSWindowsScreen::fakeMouseButton(ButtonID id, bool press)
 {
 	m_desks->fakeMouseButton(id, press);
+
+	if (id == kButtonLeft) {
+		if (press) {
+			m_buttons[kButtonLeft] = true;
+		}
+		else {
+			m_buttons[kButtonLeft] = false;
+			m_fakeDraggingStarted = false;
+			m_draggingStarted = false;
+		}
+	}
 }
 
 void
 CMSWindowsScreen::fakeMouseMove(SInt32 x, SInt32 y)
 {
 	m_desks->fakeMouseMove(x, y);
+	if (m_buttons[kButtonLeft]) {
+		m_draggingStarted = true;
+	}
 }
 
 void
diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt
index bf7e860c..d912aef4 100644
--- a/src/lib/platform/CMakeLists.txt
+++ b/src/lib/platform/CMakeLists.txt
@@ -123,6 +123,7 @@ endif()
 
 include_directories(${inc})
 add_library(platform STATIC ${src})
+target_link_libraries(platform client ${libs})
 
 if (UNIX)
 	target_link_libraries(platform io net ipc synergy server client ${libs})
diff --git a/src/lib/platform/COSXDragSimulator.m b/src/lib/platform/COSXDragSimulator.m
index 8839aea8..09f4b09b 100644
--- a/src/lib/platform/COSXDragSimulator.m
+++ b/src/lib/platform/COSXDragSimulator.m
@@ -37,7 +37,7 @@ runCocoaApp()
     g_app = app;
 	
     NSWindow* window = [[NSWindow alloc]
-						initWithContentRect: NSMakeRect(0, 0, 100, 4)
+						initWithContentRect: NSMakeRect(0, 0, 3, 3)
 						styleMask: NSBorderlessWindowMask
 						backing: NSBackingStoreBuffered
 						defer: NO];
@@ -45,7 +45,7 @@ runCocoaApp()
 	[window setAlphaValue:0.1];
 	[window makeKeyAndOrderFront:nil];
 	
-	COSXDragView* dragView = [[COSXDragView alloc] initWithFrame:NSMakeRect(0, 0, 100, 4)];
+	COSXDragView* dragView = [[COSXDragView alloc] initWithFrame:NSMakeRect(0, 0, 3, 3)];
 	
 	g_dragWindow = window;
 	g_dragView = dragView;
@@ -74,24 +74,10 @@ fakeDragging(const char* str, int length, int cursorX, int cursorY)
 		
 	int newPosX = 0;
 	int newPosY = 0;
-	if (cursorX == 0) {
-		newPosX = cursorX - 99;
-	}
-	else if (cursorX == screen.size.width - 1) {
-		newPosX = cursorX - 1;
-	}
-	newPosY = screen.size.height - cursorY - 2;
+	newPosX = cursorX - 1;
+	newPosY = screen.size.height - cursorY - 1;
 	
-	if (cursorY == 0) {
-		newPosY = screen.size.height - 1;
-		newPosX = cursorX - 50;
-	}
-	else if (cursorY == screen.size.height - 1) {
-		newPosY = 1;
-		newPosX = cursorX - 50;
-	}
-	
-	NSRect rect = NSMakeRect(newPosX, newPosY, 100, 4);
+	NSRect rect = NSMakeRect(newPosX, newPosY, 3, 3);
 	NSLog ( @"newPosX: %d", newPosX);
 	NSLog ( @"newPosY: %d", newPosY);
 		
diff --git a/src/lib/platform/COSXScreen.cpp b/src/lib/platform/COSXScreen.cpp
index b35f36ab..358a774a 100644
--- a/src/lib/platform/COSXScreen.cpp
+++ b/src/lib/platform/COSXScreen.cpp
@@ -102,7 +102,6 @@ COSXScreen::COSXScreen(IEventQueue* events, bool isPrimary, bool autoShowHideCur
 	m_eventTapRLSR(nullptr),
 	m_eventTapPort(nullptr),
 	m_pmRootPort(0),
-	m_fakeDraggingStarted(false),
 	m_getDropTargetThread(NULL)
 {
 	try {
@@ -601,7 +600,6 @@ COSXScreen::fakeMouseButton(ButtonID id, bool press)
 				this, &COSXScreen::getDropTargetThread));
 		}
 		
-		m_fakeDraggingStarted = false;
 		m_draggingStarted = false;
 	}
 }
@@ -637,6 +635,7 @@ COSXScreen::getDropTargetThread(void*)
 #else
 	LOG((CLOG_WARN "drag drop not supported"));
 #endif
+	m_fakeDraggingStarted = false;
 }
 
 void
@@ -743,15 +742,6 @@ COSXScreen::showCursor()
 	}
 
 	m_cursorHidden = false;
-	
-	if (m_fakeDraggingStarted) {
-#if defined(MAC_OS_X_VERSION_10_7)
-		// TODO: use real file extension
-		fakeDragging("txt", 3, m_xCursor, m_yCursor);
-#else
-		LOG((CLOG_WARN "drag drop not supported"));
-#endif
-	}
 }
 
 void
@@ -1234,6 +1224,11 @@ COSXScreen::onMouseButton(bool pressed, UInt16 macButton)
 			LOG((CLOG_DEBUG2 "dragging file directory is cleared"));
 		}
 		else {
+			if (m_fakeDraggingStarted) {
+				m_getDropTargetThread = new CThread(new TMethodJob<COSXScreen>(
+																			   this, &COSXScreen::getDropTargetThread));
+			}
+			
 			m_draggingStarted = false;
 		}
 	}
@@ -2093,6 +2088,12 @@ void
 COSXScreen::fakeDraggingFiles(CString str)
 {
 	m_fakeDraggingStarted = true;
+#if defined(MAC_OS_X_VERSION_10_7)
+	// TODO: use real file extension
+	fakeDragging("txt", 3, m_xCursor, m_yCursor);
+#else
+	LOG((CLOG_WARN "drag drop not supported"));
+#endif
 }
 
 CString&
diff --git a/src/lib/platform/COSXScreen.h b/src/lib/platform/COSXScreen.h
index 080c15e9..cea276fe 100644
--- a/src/lib/platform/COSXScreen.h
+++ b/src/lib/platform/COSXScreen.h
@@ -345,7 +345,6 @@ private:
 
 	IEventQueue*			m_events;
 	
-	bool					m_fakeDraggingStarted;
 	CThread*				m_getDropTargetThread;
 	CString					m_dropTarget;
 };
diff --git a/src/lib/server/CServer.cpp b/src/lib/server/CServer.cpp
index 92c47e24..45c2333f 100644
--- a/src/lib/server/CServer.cpp
+++ b/src/lib/server/CServer.cpp
@@ -75,7 +75,8 @@ CServer::CServer(CConfig& config, CPrimaryClient* primaryClient, CScreen* screen
 	m_keyboardBroadcasting(false),
 	m_lockedToScreen(false),
 	m_screen(screen),
-	m_sendFileThread(NULL)
+	m_sendFileThread(NULL),
+	m_writeToDropDir(NULL)
 {
 	// must have a primary client and it must have a canonical name
 	assert(m_primaryClient != NULL);
@@ -1957,27 +1958,42 @@ void
 CServer::onFileRecieveCompleted()
 {
 	if (isReceivedFileSizeValid()) {
-		m_fileTransferDes = m_screen->getDropTarget();
-		if (!m_fileTransferDes.empty() && m_dragFileList.size() > 0) {
-			std::fstream file;
-			CString dropTarget = m_fileTransferDes;
-#ifdef SYSAPI_WIN32
-			dropTarget.append("\\");
-#else
-			dropTarget.append("/");
-#endif
-			dropTarget.append(m_dragFileList.at(0));
-			file.open(dropTarget.c_str(), std::ios::out | std::ios::binary);
-			if (!file.is_open()) {
-				// TODO: file open failed
-			}
+		m_writeToDropDir = new CThread(
+									   new TMethodJob<CServer>(
+															   this, &CServer::writeToDropDirThread));
+	}
+}
 
-			file.write(m_receivedFileData.c_str(), m_receivedFileData.size());
-			file.close();
-		}
-		else {
-			LOG((CLOG_ERR "drop file failed: drop target is empty"));
+void
+CServer::writeToDropDirThread(void*)
+{
+	while (m_screen->getFakeDraggingStarted()) {
+		LOG((CLOG_DEBUG "write to drop dir: fakeDraggingStarted = true"));
+		ARCH->sleep(.1f);
+	}
+	
+	LOG((CLOG_DEBUG "write to drop dir: fakeDraggingStarted = false"));
+	
+	m_fileTransferDes = m_screen->getDropTarget();
+	if (!m_fileTransferDes.empty() && m_dragFileList.size() > 0) {
+		std::fstream file;
+		CString dropTarget = m_fileTransferDes;
+#ifdef SYSAPI_WIN32
+		dropTarget.append("\\");
+#else
+		dropTarget.append("/");
+#endif
+		dropTarget.append(m_dragFileList.at(0));
+		file.open(dropTarget.c_str(), std::ios::out | std::ios::binary);
+		if (!file.is_open()) {
+			// TODO: file open failed
 		}
+		
+		file.write(m_receivedFileData.c_str(), m_receivedFileData.size());
+		file.close();
+	}
+	else {
+		LOG((CLOG_ERR "drop file failed: drop target is empty"));
 	}
 }
 
@@ -2309,8 +2325,20 @@ CServer::dragInfoReceived(UInt32 fileNum, CString content)
 	LOG((CLOG_DEBUG "total drag file number: %i", m_dragFileList.size()));
 	
 	for(int i = 0; i < m_dragFileList.size(); ++i) {
-		LOG((CLOG_DEBUG2 "dragging file %i name: %s", i + 1, m_dragFileList.at(i).c_str()));
+		LOG((CLOG_DEBUG "dragging file %i name: %s", i + 1, m_dragFileList.at(i).c_str()));
 	}
+	
+	if (m_dragFileList.size() == 1) {
+		m_dragFileExt = CDragInformation::getDragFileExtension(m_dragFileList.at(0));
+	}
+	else if (m_dragFileList.size() > 1) {
+		m_dragFileExt.clear();
+	}
+	else {
+		return;
+	}
+	
+	m_screen->startDraggingFiles(m_dragFileExt);
 }
 
 void
diff --git a/src/lib/server/CServer.h b/src/lib/server/CServer.h
index b4cf7e34..c2aae6d4 100644
--- a/src/lib/server/CServer.h
+++ b/src/lib/server/CServer.h
@@ -362,6 +362,9 @@ private:
 	
 	// thread funciton for sending file
 	void				sendFileThread(void*);
+	
+	// thread function for writing file to drop directory
+	void				writeToDropDirThread(void*);
 
 public:
 	bool				m_mock;
@@ -466,6 +469,8 @@ private:
 	CString				m_fileTransferDes;
 	CDragFileList		m_dragFileList;
 	CThread*			m_sendFileThread;
+	CThread*			m_writeToDropDir;
+	CString				m_dragFileExt;
 };
 
 #endif
diff --git a/src/lib/synergy/CPlatformScreen.cpp b/src/lib/synergy/CPlatformScreen.cpp
index 41be16c7..36f4801b 100644
--- a/src/lib/synergy/CPlatformScreen.cpp
+++ b/src/lib/synergy/CPlatformScreen.cpp
@@ -20,7 +20,8 @@
 
 CPlatformScreen::CPlatformScreen(IEventQueue* events) :
 	IPlatformScreen(events),
-	m_draggingStarted(false)
+	m_draggingStarted(false),
+	m_fakeDraggingStarted(false)
 {
 }
 
diff --git a/src/lib/synergy/CPlatformScreen.h b/src/lib/synergy/CPlatformScreen.h
index b58f2223..989eb50c 100644
--- a/src/lib/synergy/CPlatformScreen.h
+++ b/src/lib/synergy/CPlatformScreen.h
@@ -79,6 +79,7 @@ public:
 
 	virtual void		setDraggingStarted(bool started) { m_draggingStarted = started; }
 	virtual bool		getDraggingStarted() { return m_draggingStarted; }
+	virtual bool		getFakeDraggingStarted() { return m_fakeDraggingStarted; }
 	virtual CString&	getDraggingFileDir() { return m_draggingFileDir; }
 
 	// IPlatformScreen overrides
@@ -121,6 +122,7 @@ protected:
 protected:
 	CString				m_draggingFileDir;
 	bool				m_draggingStarted;
+	bool				m_fakeDraggingStarted;
 };
 
 #endif
diff --git a/src/lib/synergy/CScreen.cpp b/src/lib/synergy/CScreen.cpp
index e06c14d9..dd72dec7 100644
--- a/src/lib/synergy/CScreen.cpp
+++ b/src/lib/synergy/CScreen.cpp
@@ -415,6 +415,12 @@ CScreen::getDraggingStarted() const
 	return m_screen->getDraggingStarted();
 }
 
+bool
+CScreen::getFakeDraggingStarted() const
+{
+	return m_screen->getFakeDraggingStarted();
+}
+
 void
 CScreen::setDraggingStarted(bool started)
 {
diff --git a/src/lib/synergy/CScreen.h b/src/lib/synergy/CScreen.h
index 92bfe3dc..de8f44fe 100644
--- a/src/lib/synergy/CScreen.h
+++ b/src/lib/synergy/CScreen.h
@@ -273,9 +273,13 @@ public:
 	*/
 	KeyModifierMask		pollActiveModifiers() const;
 
-	//! Check if dragging has started.
+	//! Check if a local dragging has started.
 
 	bool				getDraggingStarted() const;
+	
+	//! Check if a fake dragging has started.
+	
+	bool				getFakeDraggingStarted() const;
 
 	//! Get dragging file's directory.
 
diff --git a/src/lib/synergy/IPlatformScreen.h b/src/lib/synergy/IPlatformScreen.h
index 73c74c79..ec5e4e9e 100644
--- a/src/lib/synergy/IPlatformScreen.h
+++ b/src/lib/synergy/IPlatformScreen.h
@@ -190,6 +190,7 @@ public:
 
 	virtual CString&	getDraggingFileDir() = 0;
 	virtual bool		getDraggingStarted() = 0;
+	virtual bool		getFakeDraggingStarted() = 0;
 
 	virtual void		fakeDraggingFiles(CString str) = 0;
 	virtual const CString&