3 files changed, 12 insertions, 8 deletions
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 365a922f9..dd64c3454 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -97,6 +97,7 @@ var activeCommentText = '';
 		$('#invisible-comment-upload').fileupload({
 			url: 'wall_attach/{{$nickname}}',
 			dataType: 'json',
+			dropZone: $(),
 			maxChunkSize: 4 * 1024 * 1024,
 			add: function(e,data) {
 
@@ -482,10 +483,13 @@ var activeCommentText = '';
 
     }
 
-    // file drag hover
-    function DragDropUploadFileHover(e) {
-      e.target.className = (e.type == "dragover" ? "hover" : "");
-    }
+	// file drag hover
+	function DragDropUploadFileHover(e) {
+		if(e.type == 'dragover')
+			$(e.target).addClass('hover');
+		else
+			$(e.target).removeClass('hover');
+	}
 
     // file selection
     function DragDropUploadFileSelectHandler(e) {
@@ -494,7 +498,7 @@ var activeCommentText = '';
       DragDropUploadFileHover(e);
       // open editor if it isn't yet initialised
 	  if (!editor) {
-			initEditor();
+			enableOnUser();
 	  }
 	  linkdrop(e);
 
@@ -586,7 +590,7 @@ $( document ).on( "click", ".wall-item-delete-link,.page-delete-link,.layout-del
 				openEditor = true;
 			}
 			if(openEditor) {
-				initEditor();
+				enableOnUser();
 			}
 		} else {
 			postSaveChanges('clean');
diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl
index 759517b7f..cd810e999 100755
--- a/view/tpl/mail_conv.tpl
+++ b/view/tpl/mail_conv.tpl
@@ -6,7 +6,7 @@
 		<div class="mail-conv-detail">
 			{{if $mail.is_recalled}}<strong>{{$mail.is_recalled}}</strong>{{/if}}
 			<div class="wall-item-name"><a class="wall-item-name-link" href="{{$mail.from_url}}">{{$mail.from_name}}</a></div>
-			<div class="autotime wall-item-ago" title="{{$mail.date}}">{{$mail.date}}</div>
+			<div class="autotime wall-item-ago" title="{{$mail.date}}"></div>
 		</div>
 	</div>
 	<div class="clearfix mail-conv-content">
diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
index 65d8dcdb4..a1784e1e6 100755
--- a/view/tpl/mail_list.tpl
+++ b/view/tpl/mail_list.tpl
@@ -2,6 +2,6 @@
 	<a href="mail/{{$message.mailbox}}/{{$message.id}}" class="nav-link{{if $message.selected}} active{{/if}}">
 		<span class="{{if ! $message.seen || $message.selected}}font-weight-bold{{/if}}">{{$message.subject}}</span><br>
 		<span class="conv-participants">{{$message.from_name}} > {{$message.to_name}}</span><br>
-		<span class="wall-item-ago autotime" title="{{$message.date}}">{{$message.date}}</span>
+		<span class="wall-item-ago autotime" title="{{$message.date}}"></span>
 	</a>
 </li>