diff --git a/js/fk.autocomplete.js b/js/fk.autocomplete.js
index c17d61fc5..3f73c6fbb 100644
--- a/js/fk.autocomplete.js
+++ b/js/fk.autocomplete.js
@@ -13,20 +13,28 @@ function ACPopup(elm,backend_url){
 	this.ready=true;
 	this.kp_timer = false;
 	this.url = backend_url;
-	
-	style = $(elm).offset();
-	w = $(elm).width();
-	h = $(elm).height();
+
+	if(typeof elm.editorId == "undefined") {	
+		style = $(elm).offset();
+		w = $(elm).width();
+		h = $(elm).height();
+	}
+	else {
+		style = $(elm.container).offset();
+		w = elm.container.offsetWidth;
+		h = elm.container.offsetHeight;
+	}
+
 	style.top=style.top+h;
 	style.width = w;
 	style.position = 'absolute';
-/*	style['max-height'] = '150px';
-	style.border = '1px solid red';
-	style.background = '#cccccc';
+	/*	style['max-height'] = '150px';
+		style.border = '1px solid red';
+		style.background = '#cccccc';
 	
-	style.overflow = 'auto';
-	style['z-index'] = '100000';
-*/
+		style.overflow = 'auto';
+		style['z-index'] = '100000';
+	*/
 	style.display = 'none';
 	
 	this.cont = $("<div class='acpopup'></div>");
@@ -65,7 +73,7 @@ ACPopup.prototype._search = function(){
 				that.cont.show();
 				$(data.items).each(function(){
 					html = "<img src='{0}' height='16px' width='16px'>{1} ({2})".format(this.photo, this.name, this.nick)
-					that.add(html, this.nick + '+' + this.id + ' - ' + this.link);
+						that.add(html, this.nick + '+' + this.id + ' - ' + this.link);
 				});			
 			} else {
 				that.cont.hide();
@@ -74,16 +82,25 @@ ACPopup.prototype._search = function(){
 	});
 	
 }
-ACPopup.prototype.add = function(label, value){
+	ACPopup.prototype.add = function(label, value){
 	var that=this;
 	var elm = $("<div class='acpopupitem' title='"+value+"'>"+label+"</div>");
 	elm.click(function(e){
-			t = $(this).attr('title').replace(new RegExp(' \- .*'),'');
-		el=$(that.element);
-		sel = el.getSelection();
-		sel.start = sel.start- that.searchText.length;
-		el.setSelection(sel.start,sel.end).replaceSelectedText(t).collapseSelection(false);
-		that.close();
+		t = $(this).attr('title').replace(new RegExp(' \- .*'),'');
+		if(typeof(that.element.container) === "undefined") {
+			el=$(that.element);
+			sel = el.getSelection();
+			sel.start = sel.start- that.searchText.length;
+			el.setSelection(sel.start,sel.end).replaceSelectedText(t+' ').collapseSelection(false);
+			that.close();
+		}
+		else {
+			txt = tinyMCE.activeEditor.getContent();
+			newtxt = txt.replace(that.searchText,t+' ');
+			tinyMCE.activeEditor.setContent(newtxt);
+			tinyMCE.activeEditor.focus();
+			that.close();
+		}
 	});
 	$(this.cont).append(elm);
 }
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index ecf27e1b1..9ded3e9b4 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -30,9 +30,26 @@ function initEditor(cb){
 			content_css: "$baseurl/view/custom_tinymce.css",
 			theme_advanced_path : false,
 			setup : function(ed) {
-				 //Character count
+				cPopup = null;
+				ed.onKeyDown.add(function(ed,e) {
+					if(cPopup !== null)
+						cPopup.onkey(e);
+				});
+
 				ed.onKeyUp.add(function(ed, e) {
 					var txt = tinyMCE.activeEditor.getContent();
+					match = txt.match(/@([^ \n]+)$/);
+					if(match!==null) {
+						if(cPopup === null) {
+							cPopup = new ACPopup(this,baseurl+"/acl");
+						}
+						if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
+						if(! cPopup.ready) cPopup = null;
+					}
+					else {
+						if(cPopup !== null) { cPopup.close(); cPopup = null; }
+					}
+
 					textlen = txt.length;
 					if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
 						$('#profile-jot-desc').html(ispublic);
@@ -41,6 +58,8 @@ function initEditor(cb){
 						$('#profile-jot-desc').html('&nbsp;');
 					}	 
 
+				 //Character count
+
 					if(textlen <= 140) {
 						$('#character-counter').removeClass('red');
 						$('#character-counter').removeClass('orange');
@@ -71,8 +90,8 @@ function initEditor(cb){
 		editor = true;
 		// setup acl popup
 		$("a#jot-perms-icon").fancybox({
-			'transitionIn' : 'none',
-			'transitionOut' : 'none'
+			'transitionIn' : 'elastic',
+			'transitionOut' : 'elastic'
 		}); 
 	} else {
 		if (typeof cb!="undefined") cb();