diff --git a/.gitignore b/.gitignore
index d816629..50686d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,7 @@
 /.sass-cache/
 /.settings/
 /log.html
+/docs/tmp/*.jpg
+/docs/tmp/*.jpeg
+/docs/tmp/*.png
+log.html
diff --git a/inc/databap.php b/inc/databap.php
index 56b18cb..e8feb33 100755
--- a/inc/databap.php
+++ b/inc/databap.php
@@ -2092,7 +2092,7 @@ class Databap extends PhpObject
 		$bSuccess = false;
 		$sDesc = '';
 		$asRefMsg = $this->oMySql->selectRow(self::MSG_TABLE, $iRefMsgId);
-		if($asRefMsg['type'] == self::MESSAGE_USER && $asRefMsg[$this->oMySql::getId(self::USER_TABLE)] == $this->getUserId()) {
+		if(($asRefMsg['type'] == self::MESSAGE_USER || $asRefMsg['type'] == self::MESSAGE_PRIVATE) && $asRefMsg[$this->oMySql::getId(self::USER_TABLE)] == $this->getUserId()) {
 			$bSuccess = $this->addMessage($sMessage, $asRefMsg['type'], $asRefMsg['id_channel'], $this->getUserId(), $iRefMsgId);
 		}
 		else $sDesc = 'Wrong user ID';
@@ -2320,9 +2320,9 @@ class Databap extends PhpObject
 		return $bExport?$this->getJsonPostResult($sSuccess, $sSuccess?'':'Aucune news', array('news'=>$asFormatNews)):$asFormatNews;
 	}
 
-	private function getConnectedChans($iuserId=0)
+	private function getConnectedChans($iUserId=0)
 	{
-		$iuserId = $iuserId>0?$iuserId:$this->getUserId();
+		$iUserId = $iUserId>0?$iUserId:$this->getUserId();
 
 		$sUserIdCol = MySqlManager::getId(self::USER_TABLE);
 		$asInfo = array('select'	=> array(MySqlManager::getId(self::CHAN_TABLE, true), MySqlManager::getText(self::CHAN_TABLE)),
diff --git a/masks/chat.html b/masks/chat.html
index 455346b..ae2ad78 100755
--- a/masks/chat.html
+++ b/masks/chat.html
@@ -839,7 +839,7 @@ function addMessage(message_info, bReset)
 	{
 		case databap.consts.msg_types.user:
 			if(message_info.id_message_ref) { //edit user message
-				let $Msg = databap.getMainElem('#chat_messages').find('p.U[data-id='+message_info.id_message_ref+']');
+				let $Msg = databap.getMainElem('#chat_messages').find('p[data-id='+message_info.id_message_ref+']');
 				$Msg.find('.msg_txt').text(message_info.message);
 				$Msg.find('.status').show().text('modifié');
 			}
@@ -873,11 +873,18 @@ function addMessage(message_info, bReset)
 			msg_body = '<span class="text action">'+message_info.nickname+' '+message_info.message+'</span>';
 			break;
 		case databap.consts.msg_types['private']:
-			slicePos = message_info.message.indexOf(' ');
-			msgTargetUser = message_info.message.substr(1, slicePos - 1);
-			var msg = message_info.message.slice(slicePos + 1);
-			msg_body = '<a class="user clickable" title="Ecrire un PM &agrave; '+message_info.nickname+'">'+message_info.nickname+'</a><span class="console"> <span class="highlight">&#64;'+msgTargetUser+'</span></span><span class="text">'+msg+'</span>';
-			sNotif = message_info.nickname+' @'+msgTargetUser+' : '+msg;
+			if(message_info.id_message_ref) { //edit user message
+				let $Msg = databap.getMainElem('#chat_messages').find('p[data-id='+message_info.id_message_ref+']');
+				$Msg.find('.msg_txt').text(message_info.message);
+				$Msg.find('.status').show().text('modifié');
+			}
+			else {
+				var slicePos = message_info.message.indexOf(' ');
+				var msgTargetUser = message_info.message.substr(1, slicePos - 1);
+				var msg = message_info.message.slice(slicePos + 1);
+				msg_body = '<a class="user clickable" title="Ecrire un PM &agrave; '+message_info.nickname+'">'+message_info.nickname+'</a><span class="console"> <span class="highlight">&#64;'+msgTargetUser+'</span></span><span class="msg_txt text'+(message_info.id_user==databap.vars.user_id?' editable':'')+'">'+msg+'</span>';
+				sNotif = message_info.nickname+' @'+msgTargetUser+' : '+msg;
+			}
 			break;
 		case databap.consts.msg_types.nick:
 			msg_body = '<span class="text">'+message_info.message+' (<a href="'+databap.getInternalLink('profil', message_info.id_user)+'" target="_blank"><i class="fa fa-c-profile fa-inline"></i>'+message_info.name+'</a>)</span>';
@@ -1021,7 +1028,7 @@ function editMessage()
 								refresh_chat();
 								$MsgInput.focus();
 							},
-							{message_id: $Editable.parents('p.U').data('id'), message: sNewMsg},
+							{message_id: $Editable.parents('p').data('id'), message: sNewMsg},
 							'json',
 							function(textStatus)
 							{