diff --git a/client/stylesheets/base.less b/client/stylesheets/base.less
index fd2f70c4114ee..8672f19690b5a 100644
--- a/client/stylesheets/base.less
+++ b/client/stylesheets/base.less
@@ -3308,3 +3308,32 @@ a.github-fork {
 		}
 	}
 }
+
+.dropzone {
+	.dropzone-overlay {
+		display: none;
+	}
+
+	&.over .dropzone-overlay {
+		background-color: rgba(0, 0, 0, 0.5);
+		position: fixed;
+		top: 0;
+		left: 0;
+		bottom: 0;
+		right: 0;
+		z-index: 1000000;
+		display: block;
+		color: white;
+		font-size: 50px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		> div {
+			background-color: rgba(0,0,0,0.6);
+			padding: 40px;
+			border-radius: 10px;
+			pointer-events: none;
+		}
+	}
+}
\ No newline at end of file
diff --git a/client/views/app/room.coffee b/client/views/app/room.coffee
index 5549afe17e6eb..a940aadde218b 100644
--- a/client/views/app/room.coffee
+++ b/client/views/app/room.coffee
@@ -457,26 +457,22 @@ Template.room.events
 	'click .stop-video': (event) ->
 		webrtc.stop()
 
-	'dragenter #dropzone': (e) ->
-		console.log 'DRAG ENTER'
+	'dragenter .dropzone': (e) ->
+		e.currentTarget.classList.add 'over'
 
-	'dragleave #dropzone': (e) ->
-		console.log 'DRAG OUT'
+	'dragleave .dropzone-overlay': (e) ->
+		e.currentTarget.parentNode.classList.remove 'over'
+
+	'dropped .dropzone-overlay': (e) ->
+		e.currentTarget.parentNode.classList.remove 'over'
 
-	'dropped #dropzone': (e) ->
 		FS?.Utility?.eachFile e, (file) ->
 			newFile = new (FS.File)(file)
 			newFile.rid = Session.get('openedRoom')
+			newFile.userId = Meteor.userId()
 			Files.insert newFile, (error, fileObj) ->
 				unless error
 					toastr.success 'Upload succeeded!'
-					console.log('room fileObj', fileObj) if window.rocketDebug
-					Meteor.call 'sendMessage',
-						_id: Random.id()
-						rid: fileObj.rid
-						msg: 'File Uploaded: *' + fileObj.original.name + '* \n' + document.location.origin + '/cfs/files/Files/' + fileObj._id
-						file:
-							_id: fileObj._id
 
 Template.room.onCreated ->
 	# this.scrollOnBottom = true
diff --git a/client/views/app/room.html b/client/views/app/room.html
index 081797b84b21f..bd30cc3042028 100644
--- a/client/views/app/room.html
+++ b/client/views/app/room.html
@@ -1,226 +1,231 @@
 <template name="room">
-	<div id=dropzone>
-	<section class="messages-container" id="{{windowId}}">
-		<header class="fixed-title">
-			<div class="burger">
-				<i></i>
-				<i></i>
-				<i></i>
+	<div class="dropzone">
+		<div class="dropzone-overlay">
+			<div>
+				Drop to upload file
 			</div>
-			<h2>
-				{{#if subscribed}}
-					<a href="#favorite" class="toggle-favorite"><i class="{{favorite}}"></i></a>
-				{{/if}}
-				<i class="{{roomIcon}} status-{{userStatus}}"></i>
-				<span class="room-title {{editingTitle}}">{{roomName}}</span>
-				{{#if canEditName}}
-				<input type="text" id="room-title-field" class="{{showEditingTitle}}" value="{{roomNameEdit}}" dir="auto">
-				<a href="#edit" class="edit-room-title"><i class="icon-pencil"></i></a>
-				{{/if}}
-			</h2>
-		</header>
-		<div class="messages-box">
-			<div class="wrapper">
-				<ul>
-					{{#if hasMore}}
-						<li class="load-more">
-							<button class="button secondary load-more {{isLoading}}">{{_ "Load_more"}}</button>
-						</li>
-					{{else}}
-						<li class="start">
-							{{_ "Start_of_conversation"}}
-						</li>
+		</div>
+		<section class="messages-container" id="{{windowId}}">
+			<header class="fixed-title">
+				<div class="burger">
+					<i></i>
+					<i></i>
+					<i></i>
+				</div>
+				<h2>
+					{{#if subscribed}}
+						<a href="#favorite" class="toggle-favorite"><i class="{{favorite}}"></i></a>
 					{{/if}}
-					{{#each messagesHistory}}
-						{{#nrr nrrargs 'message' .}}{{/nrr}}
-					{{/each}}
-				</ul>
-			</div>
-			<div class="new-message not">
-				<i class="icon-down-big"></i>
-				<span>{{_ "New_messages"}}</span>
+					<i class="{{roomIcon}} status-{{userStatus}}"></i>
+					<span class="room-title {{editingTitle}}">{{roomName}}</span>
+					{{#if canEditName}}
+					<input type="text" id="room-title-field" class="{{showEditingTitle}}" value="{{roomNameEdit}}" dir="auto">
+					<a href="#edit" class="edit-room-title"><i class="icon-pencil"></i></a>
+					{{/if}}
+				</h2>
+			</header>
+			<div class="messages-box">
+				<div class="wrapper">
+					<ul>
+						{{#if hasMore}}
+							<li class="load-more">
+								<button class="button secondary load-more {{isLoading}}">{{_ "Load_more"}}</button>
+							</li>
+						{{else}}
+							<li class="start">
+								{{_ "Start_of_conversation"}}
+							</li>
+						{{/if}}
+						{{#each messagesHistory}}
+							{{#nrr nrrargs 'message' .}}{{/nrr}}
+						{{/each}}
+					</ul>
+				</div>
+				<div class="new-message not">
+					<i class="icon-down-big"></i>
+					<span>{{_ "New_messages"}}</span>
+				</div>
 			</div>
-		</div>
-		<footer class="footer">
-			{{#if subscribed}}
-				<form class="message-form" method="post" action="/">
-					<div>
-						{{> messagePopupConfig getPupupConfig}}
-						<textarea dir="auto" name="msg" class="input-message"></textarea>
-						<i class="icon-paper-plane" title="{{_ "Send_Message"}}"></i>
-					</div>
-					<div class="users-typing">
-						{{#with usersTyping}}
-							<strong>{{users}}</strong>
-							{{#if multi}}
-								{{#if selfTyping}}
-									{{_ "are_also_typing"}}
-								{{else}}
-									{{_ "are_typing"}}
-								{{/if}}
-							{{else}}
-								{{#if selfTyping}}
-									{{_ "is_also_typing" context="male"}}
+			<footer class="footer">
+				{{#if subscribed}}
+					<form class="message-form" method="post" action="/">
+						<div>
+							{{> messagePopupConfig getPupupConfig}}
+							<textarea dir="auto" name="msg" class="input-message"></textarea>
+							<i class="icon-paper-plane" title="{{_ "Send_Message"}}"></i>
+						</div>
+						<div class="users-typing">
+							{{#with usersTyping}}
+								<strong>{{users}}</strong>
+								{{#if multi}}
+									{{#if selfTyping}}
+										{{_ "are_also_typing"}}
+									{{else}}
+										{{_ "are_typing"}}
+									{{/if}}
 								{{else}}
-									{{_ "is_typing" context="male"}}
+									{{#if selfTyping}}
+										{{_ "is_also_typing" context="male"}}
+									{{else}}
+										{{_ "is_typing" context="male"}}
+									{{/if}}
 								{{/if}}
-							{{/if}}
-						{{/with}}
-					</div>
-					<div class="formatting-tips" aria-hidden="true" dir="auto">
-						<b>*{{_ "bold"}}*</b>
-						<i>_{{_ "italics"}}_</i>
-						<span>~<strike>{{_ "strike"}}</strike>~</span>
-						<code class="inline">`{{_ "inline_code"}}`</code>
-						<code class="inline"><span class="hidden-br"><br></span>```<span class="hidden-br"><br></span><i class="icon-level-down"></i>{{_ "multi"}}<span class="hidden-br"><br></span><i class="icon-level-down"></i>{{_ "line"}}<span class="hidden-br"><br></span><i class="icon-level-down"></i>```</code>
-						<q><span class="hidden-br"><br></span>&gt;{{_ "quote"}}</q>
-					</div>
-				</form>
-			{{else}}
-				<div>
-					{{{_ "you_are_in_preview_mode_of" room_name=roomName}}}
-					<button class="button join"><span><i class="icon-login"></i> {{_ "join"}}</span></button>
-				</div>
-			{{/if}}
-		</footer>
-	</section>
-	<section class="flex-tab">
-		<div class="control">
-			<button class="more"><span class="arrow {{arrowPosition}}"></span></button>
-			{{#if canAddUser}}
-				<div class="search-form">
-					<div class="input-line search">
-						{{> inputAutocomplete settings=autocompleteSettingsAddUser id="user-add-search" class="search" placeholder=tAddUsers}}
-						<i class="icon-plus"></i>
-					</div>
-				</div>
-			{{else}}
-				{{#if isChannel}}
-					<form class="search-form" role="form">
-						<div class="input-line search">
-							{{> inputAutocomplete settings=autocompleteSettingsRoomSearch id="room-search" class="search" placeholder=tQuickSearch autocomplete="off"}}
-							<i class="icon-search"></i>
+							{{/with}}
+						</div>
+						<div class="formatting-tips" aria-hidden="true" dir="auto">
+							<b>*{{_ "bold"}}*</b>
+							<i>_{{_ "italics"}}_</i>
+							<span>~<strike>{{_ "strike"}}</strike>~</span>
+							<code class="inline">`{{_ "inline_code"}}`</code>
+							<code class="inline"><span class="hidden-br"><br></span>```<span class="hidden-br"><br></span><i class="icon-level-down"></i>{{_ "multi"}}<span class="hidden-br"><br></span><i class="icon-level-down"></i>{{_ "line"}}<span class="hidden-br"><br></span><i class="icon-level-down"></i>```</code>
+							<q><span class="hidden-br"><br></span>&gt;{{_ "quote"}}</q>
 						</div>
 					</form>
+				{{else}}
+					<div>
+						{{{_ "you_are_in_preview_mode_of" room_name=roomName}}}
+						<button class="button join"><span><i class="icon-login"></i> {{_ "join"}}</span></button>
+					</div>
 				{{/if}}
-			{{/if}}
-		</div>
-		{{#if flexOpened}}
-			<div class="content">
-				{{#if isGroupChat}}
-					<div class="list-view{{#if $.Session.get 'showUserInfo'}} -hidden{{/if}}">
-						{{#with roomUsers}}
-							<div class="status">
-								<h2>{{_ "Members_List"}}</h2> {{!--
-								<p>
-									{{{_ "Showing_online_users" total_online=totalOnline total=total}}}
-									<button class="see-all">{{seeAll}}</button>
-								</p>--}}
-							</div>
-							<ul class='list cf_ lines'>
-								{{#each users}}
-									<li class='user-image user-card-room status-{{status}}'>
-										<a data-username="{{username}}" tabindex="0" title="{{username}}">
-											{{> avatar username=username}}
-											<p>{{username}}</p>
-										</a>
-									</li>
-								{{/each}}
-							</ul>
-						{{/with}}
+			</footer>
+		</section>
+		<section class="flex-tab">
+			<div class="control">
+				<button class="more"><span class="arrow {{arrowPosition}}"></span></button>
+				{{#if canAddUser}}
+					<div class="search-form">
+						<div class="input-line search">
+							{{> inputAutocomplete settings=autocompleteSettingsAddUser id="user-add-search" class="search" placeholder=tAddUsers}}
+							<i class="icon-plus"></i>
+						</div>
 					</div>
-					<div class="user-view animated{{#unless $.Session.get 'showUserInfo'}} -hidden{{/unless}}">
-						{{#with flexUserInfo}}
-							<div class="about cf_">
-								<div class="thumb">
-									{{> avatar username=username}}
+				{{else}}
+					{{#if isChannel}}
+						<form class="search-form" role="form">
+							<div class="input-line search">
+								{{> inputAutocomplete settings=autocompleteSettingsRoomSearch id="room-search" class="search" placeholder=tQuickSearch autocomplete="off"}}
+								<i class="icon-search"></i>
+							</div>
+						</form>
+					{{/if}}
+				{{/if}}
+			</div>
+			{{#if flexOpened}}
+				<div class="content">
+					{{#if isGroupChat}}
+						<div class="list-view{{#if $.Session.get 'showUserInfo'}} -hidden{{/if}}">
+							{{#with roomUsers}}
+								<div class="status">
+									<h2>{{_ "Members_List"}}</h2> {{!--
+									<p>
+										{{{_ "Showing_online_users" total_online=totalOnline total=total}}}
+										<button class="see-all">{{seeAll}}</button>
+									</p>--}}
 								</div>
-								<div class="info">
-									<h3>{{username}}</h3>
-									{{#if contactCode}}
-										<div class="contact-code">{{_ "Contact"}} {{contactCode}}</div>
-									{{/if}}
-									{{!--
-									{{#each emails}}
-										<p><i class="icon-mail"></i> {{address}}</p>
+								<ul class='list cf_ lines'>
+									{{#each users}}
+										<li class='user-image user-card-room status-{{status}}'>
+											<a data-username="{{username}}" tabindex="0" title="{{username}}">
+												{{> avatar username=username}}
+												<p>{{username}}</p>
+											</a>
+										</li>
 									{{/each}}
-									{{#if phone}}
-										<p><i class="icon-phone"></i> {{phone}}</p>
-									{{/if}}
-									--}}
-								</div>
-							</div>
-							<nav>
-								<button class='button secondary back'><span>{{_ "View_All"}} <i class='icon-angle-right'></i></span></button>
-								<button class='button pvt-msg'><span><i class='icon-chat'></i> {{_ "Conversation"}}</span></button>
-							</nav>
-						{{/with}}
-					</div>
-				{{else}}
-					<div class="user-view">
-						{{#with userData}}
-							<div class="about cf_">
-
-									{{#if selfVideoUrl}}
-										{{#if rtcLayout3}}
-											<div id='fullscreendiv' style="width: 100%">
-											<video id='videoremote' class="video-remote" src="{{remoteVideoUrl}}" style="width: 100%; align-items: center; margin-bottom: 10px; background-color: #000; transition: width 2s, height 2s, top 2s, left 2s, transform 2s;" autoplay></video>
-											<video id='videoself' class="video-self" src="{{selfVideoUrl}}" style="width: 250px; position: absolute; top: 21px; right: 31px; border: 1px solid #FFF; background-color: #000; transition: width 2s, height 2s, top 2s, left 2s, transform 2s;" autoplay muted></video>
-											</div>
-										{{/if}}
-										{{#if rtcLayout2}}
-											<div style="display: flex; flex-direction: row; align-items: center; width: 800px; height: 350px">
-											<video id="videoremote" class="video-remote" src="{{remoteVideoUrl}}" style="flex: 1 0; min-width: 380px; height: 285px; margin: 10px; background-color: #000;"  autoplay></video>
-											<video id="videoself" class="video-self" src="{{selfVideoUrl}}" style="flex: 1 0;  min-width: 380px; height: 285px; margin: 10px; background-color: #000;" autoplay muted></video>
-										</div>
+								</ul>
+							{{/with}}
+						</div>
+						<div class="user-view animated{{#unless $.Session.get 'showUserInfo'}} -hidden{{/unless}}">
+							{{#with flexUserInfo}}
+								<div class="about cf_">
+									<div class="thumb">
+										{{> avatar username=username}}
+									</div>
+									<div class="info">
+										<h3>{{username}}</h3>
+										{{#if contactCode}}
+											<div class="contact-code">{{_ "Contact"}} {{contactCode}}</div>
 										{{/if}}
-										{{#if rtcLayout1}}
-											<div style="display: flex; flex-direction: column; align-items: center; width: 360px; height: 500px">
-											<video class="video-remote" src="{{remoteVideoUrl}}" style="flex: 1 1;  width: 320px; margin: 10px; background-color: #000;" autoplay></video>
-											<video class="video-self" src="{{selfVideoUrl}}" style="flex: 1 1; width: 320px; margin: 10px; background-color: #000;" autoplay muted></video>
-											</div>
+										{{!--
+										{{#each emails}}
+											<p><i class="icon-mail"></i> {{address}}</p>
+										{{/each}}
+										{{#if phone}}
+											<p><i class="icon-phone"></i> {{phone}}</p>
 										{{/if}}
-										{{#if noRtcLayout}}
-											<div>
-											<video class="video-remote" src="{{remoteVideoUrl}}" style="width: 100%; margin-bottom: 10px; background-color: #000; transition: width 2s, height 2s, top 2s, left 2s, transform 2s;" autoplay></video>
-											<video class="video-self" src="{{selfVideoUrl}}" style="width: 100px; position: absolute; top: 21px; right: 21px; border: 1px solid #FFF; background-color: #000; transition: width 2s, height 2s, top 2s, left 2s, transform 2s;" autoplay muted></video>
+										--}}
+									</div>
+								</div>
+								<nav>
+									<button class='button secondary back'><span>{{_ "View_All"}} <i class='icon-angle-right'></i></span></button>
+									<button class='button pvt-msg'><span><i class='icon-chat'></i> {{_ "Conversation"}}</span></button>
+								</nav>
+							{{/with}}
+						</div>
+					{{else}}
+						<div class="user-view">
+							{{#with userData}}
+								<div class="about cf_">
+
+										{{#if selfVideoUrl}}
+											{{#if rtcLayout3}}
+												<div id='fullscreendiv' style="width: 100%">
+												<video id='videoremote' class="video-remote" src="{{remoteVideoUrl}}" style="width: 100%; align-items: center; margin-bottom: 10px; background-color: #000; transition: width 2s, height 2s, top 2s, left 2s, transform 2s;" autoplay></video>
+												<video id='videoself' class="video-self" src="{{selfVideoUrl}}" style="width: 250px; position: absolute; top: 21px; right: 31px; border: 1px solid #FFF; background-color: #000; transition: width 2s, height 2s, top 2s, left 2s, transform 2s;" autoplay muted></video>
+												</div>
+											{{/if}}
+											{{#if rtcLayout2}}
+												<div style="display: flex; flex-direction: row; align-items: center; width: 800px; height: 350px">
+												<video id="videoremote" class="video-remote" src="{{remoteVideoUrl}}" style="flex: 1 0; min-width: 380px; height: 285px; margin: 10px; background-color: #000;"  autoplay></video>
+												<video id="videoself" class="video-self" src="{{selfVideoUrl}}" style="flex: 1 0;  min-width: 380px; height: 285px; margin: 10px; background-color: #000;" autoplay muted></video>
 											</div>
+											{{/if}}
+											{{#if rtcLayout1}}
+												<div style="display: flex; flex-direction: column; align-items: center; width: 360px; height: 500px">
+												<video class="video-remote" src="{{remoteVideoUrl}}" style="flex: 1 1;  width: 320px; margin: 10px; background-color: #000;" autoplay></video>
+												<video class="video-self" src="{{selfVideoUrl}}" style="flex: 1 1; width: 320px; margin: 10px; background-color: #000;" autoplay muted></video>
+												</div>
+											{{/if}}
+											{{#if noRtcLayout}}
+												<div>
+												<video class="video-remote" src="{{remoteVideoUrl}}" style="width: 100%; margin-bottom: 10px; background-color: #000; transition: width 2s, height 2s, top 2s, left 2s, transform 2s;" autoplay></video>
+												<video class="video-self" src="{{selfVideoUrl}}" style="width: 100px; position: absolute; top: 21px; right: 21px; border: 1px solid #FFF; background-color: #000; transition: width 2s, height 2s, top 2s, left 2s, transform 2s;" autoplay muted></video>
+												</div>
+											{{/if}}
 										{{/if}}
-									{{/if}}
 
-								<div class="thumb">
-									{{> avatar username=username}}
-								</div>
-								<div class="info">
-									<h3>{{username}}</h3>
-									{{#if contactCode}}
-										<div class="contact-code">{{_ "contact"}} {{contactCode}}</div>
-									{{/if}}
-									{{!--
-									{{#each emails}}
-										<p><i class="icon-mail"></i> {{address}}</p>
-									{{/each}}
-									{{#each phone}}
-										<p><i class="icon-phone"></i> {{phoneNumber}}</p>
-									{{/each}}
-									--}}
+									<div class="thumb">
+										{{> avatar username=username}}
+									</div>
+									<div class="info">
+										<h3>{{username}}</h3>
+										{{#if contactCode}}
+											<div class="contact-code">{{_ "contact"}} {{contactCode}}</div>
+										{{/if}}
+										{{!--
+										{{#each emails}}
+											<p><i class="icon-mail"></i> {{address}}</p>
+										{{/each}}
+										{{#each phone}}
+											<p><i class="icon-phone"></i> {{phoneNumber}}</p>
+										{{/each}}
+										--}}
+									</div>
 								</div>
-							</div>
-							<nav>
-								{{#unless selfVideoUrl}}
-									<button class='button start-video'><span><i class='icon-videocam'></i> {{_ "Video"}}</span></button>
-								{{else}}
-									<button class='button red stop-video'><span><i class='icon-videocam'></i> {{_ "StopVideo"}}</span></button>
-								{{/unless}}
-							</nav>
-						{{/with}}
-					</div>
-				{{/if}}
-			</div>
-		{{/if}}
-		<footer>
-			{{> social}}
-		</footer>
-	</section>
-</div>
+								<nav>
+									{{#unless selfVideoUrl}}
+										<button class='button start-video'><span><i class='icon-videocam'></i> {{_ "Video"}}</span></button>
+									{{else}}
+										<button class='button red stop-video'><span><i class='icon-videocam'></i> {{_ "StopVideo"}}</span></button>
+									{{/unless}}
+								</nav>
+							{{/with}}
+						</div>
+					{{/if}}
+				</div>
+			{{/if}}
+			<footer>
+				{{> social}}
+			</footer>
+		</section>
+	</div>
 </template>
diff --git a/lib/fileUpload.coffee b/lib/fileUpload.coffee
index 6805f53015fa0..dfb5bf53b4dd6 100644
--- a/lib/fileUpload.coffee
+++ b/lib/fileUpload.coffee
@@ -1,10 +1,23 @@
 if FS?
 
 	@fileStore = new FS.Store.GridFS 'files'
+
+	fileStore.on 'stored', Meteor.bindEnvironment (storeName, fileObj) ->
+		Meteor.runAsUser fileObj.userId, ->
+			Meteor.call 'sendMessage',
+				_id: Random.id()
+				rid: fileObj.rid
+				msg: """
+					File Uploaded: *#{fileObj.original.name}*
+					#{Meteor.absoluteUrl()}/cfs/files/Files/#{fileObj._id}
+				"""
+				file:
+					_id: fileObj._id
+
 	@Files = new FS.Collection 'Files',
 		stores: [fileStore],
 		filter:
-			maxSize: 1048576,
+			maxSize: 2097152,
 			allow:
 				contentTypes: ['image/*']
 			onInvalid: (message) ->