From 48a904b8c0ae134f5ffc9f2af7d2513ed5e3930c Mon Sep 17 00:00:00 2001
From: LubuWest <thomasschmidt45@gmx.net>
Date: Sun, 13 Mar 2022 21:22:08 +0100
Subject: [PATCH] bugfixes reply in Friendica 3/2022 and image download

---
 CHANGELOG.md                                |   6 +-
 source-android/android/AndroidManifest.xml  |   2 +-
 source-linux/common/xhr.cpp                 |   3 +-
 source-linux/js/helper.js                   |   2 +-
 source-linux/js/image.js                    |  27 +-
 source-linux/js/news.js                     |   8 +-
 source-linux/js/service.js                  |   2 +-
 source-linux/js/smiley.js                   | 932 ++++++++++----------
 source-linux/qml/configqml/InfoBox.qml      |   2 +-
 source-linux/qml/newsqml/Conversation.qml   |   2 +-
 source-linux/qml/newsqml/MessageSend.qml    | 697 ++++++++-------
 source-linux/qml/newsqml/NewsVideo.qml      |   2 +-
 source-linux/qml/newsqml/NewsVideoLarge.qml |   4 +-
 source-linux/qml/newsqml/Newsitem.qml       |  53 +-
 source-linux/qml/photoqml/PhotoTab.qml      |  22 +-
 15 files changed, 909 insertions(+), 855 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4ca060..bffa2fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## v0.6.5
+
+* Fix reply in Friendica 3/2022 version due to API bug
+* Image downloads work again
+* Some additional emojis
 
 ## v0.6.4
 
@@ -5,7 +10,6 @@
 * Filter contacts
 * many new emojis
 * Replaced Favorite button with Reply button due to buggy Favourite API
-* View newsitem on website (works only in coversation view)
 * Rebuild contacts handling due to buggy Contacts API
 * Removed permissions for new messages due to buggy Contacts API
 * Sync all accounts in background (not only active)
diff --git a/source-android/android/AndroidManifest.xml b/source-android/android/AndroidManifest.xml
index 4e9e9e6..8747bc9 100644
--- a/source-android/android/AndroidManifest.xml
+++ b/source-android/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="org.qtproject.friendiqa" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.6.4" android:versionCode="30" android:installLocation="auto">
+<manifest package="org.qtproject.friendiqa" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.6.5" android:versionCode="31" android:installLocation="auto">
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30"/>
 
     <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
diff --git a/source-linux/common/xhr.cpp b/source-linux/common/xhr.cpp
index be669a4..7a53154 100644
--- a/source-linux/common/xhr.cpp
+++ b/source-linux/common/xhr.cpp
@@ -224,7 +224,7 @@ void XHR::getlist()
             XHR::setUrl(m_filelist.at(dlindex));}
         else {
             XHR::setUrl(m_filelist.at(dlindex));}
-        //qDebug() << "start download" << m_url;
+        qDebug() << "start download" << m_url;
         XHR::download();
     } else {dlindex=0;m_downloadtype="";m_contactlist.clear();m_filelist.clear();}
 }
@@ -293,6 +293,7 @@ void XHR::onReplySuccess()
 void XHR::onRequestFinished()
 {
     // Save the file here
+    //qDebug() << "buffer " << buffer;
     if (buffer.isNull()){qDebug() << "File empty"<<m_url; buffer.clear(); emit this->error(m_downloadtype,m_url,m_api,1);}
     else if (m_downloadtype=="picturelist") {
         QJsonDocument jsonResponse = QJsonDocument::fromJson(buffer);
diff --git a/source-linux/js/helper.js b/source-linux/js/helper.js
index b99caef..a9584d3 100644
--- a/source-linux/js/helper.js
+++ b/source-linux/js/helper.js
@@ -59,7 +59,7 @@ function friendicaPostRequest(login,api,data,method,rootwindow,callback) {
         //print(api+JSON.stringify(login)+Qt.atob(login.password));
         if (xhrequest.readyState === XMLHttpRequest.HEADERS_RECEIVED) {
             } else if(xhrequest.readyState === XMLHttpRequest.DONE) {
-                try{ if (xhrequest.responseText!=""){
+                try{ if (xhrequest.responseText!=""){print (xhrequest.responseText)
                         callback(xhrequest.responseText)
                         }else{//print("API:\n" +api+" NO RESPONSE");
                         //showMessage("Error","API:\n" +api+" NO RESPONSE",rootwindow)
diff --git a/source-linux/js/image.js b/source-linux/js/image.js
index 61dcee7..299675b 100644
--- a/source-linux/js/image.js
+++ b/source-linux/js/image.js
@@ -54,7 +54,8 @@ function dataRequest(login,photo,database,xhr,rootwindow) {
     // check if image exist and call download function
 
     Helperjs.friendicaRequest(login,"/api/friendica/photo?photo_id="+photo.id, rootwindow, function (image){
-        if(image==""){currentimageno=currentimageno+1}else{
+        if(image=="" || typeof(image)=="undefined"){currentimageno=currentimageno+1}else{
+
             try{
                 var obj = JSON.parse(image);
                 if (obj.hasOwnProperty('status')){
@@ -109,6 +110,30 @@ function dataRequest(login,photo,database,xhr,rootwindow) {
                         }
                     })
             }} catch (e){
+                var helpfilename=photo.filename.substring(0,photo.filename.lastIndexOf("."));
+                var filesuffix="";
+                if (photo.type=="image/jpeg"){filesuffix=".jpg"}
+                else if (photo.type=="image/png"){filesuffix=".png"}
+                else {filesuffix=""}
+                if (helpfilename==""){// check if file has any filename
+                    photo.filename=photo["id"]+filesuffix;
+                }
+                else{photo.filename=helpfilename+filesuffix}
+                var link="";
+                xhr.setUrl(Qt.resolvedUrl(photo.thumb));
+                xhr.setLogin(login.username+":"+Qt.atob(login.password));
+                xhr.setFilename(login.imagestore+'albums/'+photo.album+"/"+photo["filename"]);
+                xhr.setDownloadtype("picture");
+                xhr.download();
+                var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
+                db.transaction( function(tx) {
+                    var result = tx.executeSql('SELECT * from imageData where id = "'+photo["id"]+'"');
+                    if(result.rows.length === 1) {// use update
+                        result = tx.executeSql('UPDATE imageData SET username ="' +login.username+ '",id="'+photo.id+'", created="'+photo.created+'", edited="'+photo.edited+'", profile="0", link="'+photo["thumb"]+'", filename="'+photo.filename+'",title="", desc="'+photo.desc+'",   type="'+photo.type+'", width="0", height="0", album="'+photo.album+'", location="file://'+login.imagestore+'albums/'+photo.album+'/" where id="'+photo["id"]+'"');
+                    } else {// use insert print('... does not exists, create it')
+                        result = tx.executeSql('INSERT INTO imageData VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)', [login.username,photo.id,photo.created,photo.edited,'', photo.desc, photo.album, photo.filename, photo.type, '', '',0,photo["thumb"],'file://'+login.imagestore+'albums/'+photo.album+"/"]);
+                    }
+                })
                 print("Data retrieval failure! "+ e+obj);
             }
         }})
diff --git a/source-linux/js/news.js b/source-linux/js/news.js
index d908855..ae5f1d2 100644
--- a/source-linux/js/news.js
+++ b/source-linux/js/news.js
@@ -344,19 +344,19 @@ function deleteNews(login,database,newsid,messagetype,rootwindow,callback){
     })}
 
 function retweetNews(login,database,newsid,rootwindow,callback){
-    Helperjs.friendicaPostRequest(login,"/api/statuses/retweet?id="+newsid,"","POST", rootwindow,function (obj){
+    Helperjs.friendicaPostRequest(login,"/api/v1/statuses/"+newsid+"/reblog","","POST", rootwindow,function (obj){
         var answer=JSON.parse(obj);
         if(answer.hasOwnProperty('status'))//('error' in answer.status)
         {Helperjs.showMessage("Repost",answer.status.code,rootwindow);}
-        else{Helperjs.showMessage("Repost",answer.text,rootwindow)}
+        else{Helperjs.showMessage("Repost",answer.content,rootwindow)}
     })
 }
 
 function favorite(login,favorited,newsid,rootwindow){
     // toggle favorites
-    if(favorited){  Helperjs.friendicaPostRequest(login,"/api/favorites/create?id="+newsid,"","POST", rootwindow,function (obj){
+    if(favorited){  Helperjs.friendicaPostRequest(login,"/api/v1/statuses/"+newsid+"/bookmark","","POST", rootwindow,function (obj){
     })}
-    else {Helperjs.friendicaPostRequest(login,"/api/favorites/destroy?id="+newsid,"","POST",rootwindow,function (obj){
+    else {Helperjs.friendicaPostRequest(login,"/api/v1/statuses/"+newsid+"/unbookmark","","POST",rootwindow,function (obj){
     })}
 }
 
diff --git a/source-linux/js/service.js b/source-linux/js/service.js
index 28798a8..e03b307 100644
--- a/source-linux/js/service.js
+++ b/source-linux/js/service.js
@@ -455,7 +455,7 @@ function processNews(api,data){
         usermessages.push(newslist.status);
         newslist=usermessages;
     }
-    if (data==""){newsBusy.running=false}
+    if (data=="" || api=="/api/v1/statuses"){print("data "+data); newsBusy.running=false}
     else if (typeof(newslist)=='undefined'){
         Helperjs.showMessage(qsTr("Undefined Array Error"),"API:\n" +login.server+api+"\n Return: \n"+data,root)
     }
diff --git a/source-linux/js/smiley.js b/source-linux/js/smiley.js
index 5732640..ae080c8 100644
--- a/source-linux/js/smiley.js
+++ b/source-linux/js/smiley.js
@@ -31,651 +31,657 @@
 
 
 var html=[//Smileys
-        '\u263A',
-        '\ud83d\ude00',
-        '\ud83d\ude02',
-        '\ud83d\ude06',
-        '\ud83d\ude07',
-        '\ud83d\ude08',
-        '\ud83d\ude09',
-        '\ud83d\ude0B',
-        '\ud83d\ude0D',
-        '\ud83d\ude0E',
-        '\ud83d\ude0F',
-        '\ud83d\ude10',
-        '\ud83d\ude15',
-        '\ud83d\ude18',
-        '\ud83d\ude1B',
-        '\ud83d\ude1C',
-        '\ud83d\ude1D',
-        '\ud83d\ude1E',
-        '\ud83d\ude1F',
-        '\ud83d\ude20',
-        '\ud83d\ude21',
-        '\ud83d\ude22',
-        '\ud83d\ude23',
-        '\ud83d\ude24',
-        '\ud83d\ude26',
-        '\ud83d\ude27',
-        '\ud83d\ude2C',
-        '\ud83d\ude2D',
-        '\ud83d\ude2E',
-        '\ud83d\ude2F',
-        '\ud83d\ude31',
-        '\ud83d\ude32',
-        '\ud83d\ude33',
-        '\ud83d\ude31',
-        '\ud83d\ude32',
-        '\ud83d\ude33',
-        '\ud83d\ude34',
-        '\ud83d\ude37',
-        '\ud83d\ude41',
-        '\ud83d\ude42',
-        '\ud83d\ude43',
-        '\ud83d\ude44',
-        '\ud83d\ude45',
-        '\ud83d\ude46',
-        '\ud83d\ude47',
-        '\ud83d\ude4B',
-        '\ud83d\ude4C',
-        '\ud83d\ude4D',
-        '\ud83d\ude4E',
-        '\ud83d\ude4F',
-        '\ud83e\udd2F',
-        '\u2639',
-        '\u263B',
-        //Weather
-        '\u2600',
-        '\u2601',
-        '\u263C',
-        '\u2614',
-        '\u2602',
-        '\u2603',
-        '\u2604',
-        '\u26C4',
-        '\u26C5',
-        '\u26C8',
-        //Leisure
-        '\u2615',
-        '\u26BD',
-        '\u26BE',
-        '\u26F1',
-        '\u26F2',
-        '\u26F3',
-        '\u26F4',
-        '\u26F5',
-        '\u26F7',
-        '\u26F8',
-        '\u26F9',
-        '\u26FA',
-        '\u26FD',
-        //Hand
-        '\u261C',
-        '\u261D',
-        '\u261E',
-        '\u261F',
-        '\u2620',
-        '\u2622',
-        '\u2623',
-        //Religion
-        '\u2626',
-        '\u262A',
-        '\u262C',
-        '\u262E',
-        '\u262F',
-        '\u26EA',
-        '\u26E9'
-]
+          '\u263A',
+          '\ud83d\ude00',
+          '\ud83d\ude02',
+          '\ud83d\ude06',
+          '\ud83d\ude07',
+          '\ud83d\ude08',
+          '\ud83d\ude09',
+          '\ud83d\ude0B',
+          '\ud83d\ude0D',
+          '\ud83d\ude0E',
+          '\ud83d\ude0F',
+          '\ud83d\ude10',
+          '\ud83d\ude15',
+          '\ud83d\ude18',
+          '\ud83d\ude1B',
+          '\ud83d\ude1C',
+          '\ud83d\ude1D',
+          '\ud83d\ude1E',
+          '\ud83d\ude1F',
+          '\ud83d\ude20',
+          '\ud83d\ude21',
+          '\ud83d\ude22',
+          '\ud83d\ude23',
+          '\ud83d\ude24',
+          '\ud83d\ude26',
+          '\ud83d\ude27',
+          '\ud83d\ude2C',
+          '\ud83d\ude2D',
+          '\ud83d\ude2E',
+          '\ud83d\ude2F',
+          '\ud83d\ude31',
+          '\ud83d\ude32',
+          '\ud83d\ude33',
+          '\ud83d\ude31',
+          '\ud83d\ude32',
+          '\ud83d\ude33',
+          '\ud83d\ude34',
+          '\ud83d\ude37',
+          '\ud83d\ude41',
+          '\ud83d\ude42',
+          '\ud83d\ude43',
+          '\ud83d\ude44',
+          '\ud83d\ude45',
+          '\ud83d\ude46',
+          '\ud83d\ude47',
+          '\ud83d\ude4B',
+          '\ud83d\ude4C',
+          '\ud83d\ude4D',
+          '\ud83d\ude4E',
+          '\ud83d\ude4F',
+          '\ud83e\udd2F',
+          '\uD83D\uDC4D',
+          '\u2764\uFE0F',
+          '\uD83D\uDCA9',
+          '\uD83D\uDC2D',
+          '\uD83D\uDC2E',
+          '\uD83D\uDC31',
+          '\u2639',
+          '\u263B',
+          //Weather
+          '\u2600',
+          '\u2601',
+          '\u263C',
+          '\u2614',
+          '\u2602',
+          '\u2603',
+          '\u2604',
+          '\u26C4',
+          '\u26C5',
+          '\u26C8',
+          //Leisure
+          '\u2615',
+          '\u26BD',
+          '\u26BE',
+          '\u26F1',
+          '\u26F2',
+          '\u26F3',
+          '\u26F4',
+          '\u26F5',
+          '\u26F7',
+          '\u26F8',
+          '\u26F9',
+          '\u26FA',
+          '\u26FD',
+          //Hand
+          '\u261C',
+          '\u261D',
+          '\u261E',
+          '\u261F',
+          '\u2620',
+          '\u2622',
+          '\u2623',
+          //Religion
+          '\u2626',
+          '\u262A',
+          '\u262C',
+          '\u262E',
+          '\u262F',
+          '\u26EA',
+          '\u26E9'
+        ]
 
 var core=[
-{name:'&lt;3',url:
-'qrc:///images/smileys/core/smiley-heart.gif'},
+            {name:'&lt;3',url:
+                'qrc:///images/smileys/core/smiley-heart.gif'},
 
-{name:'&lt;/3',url:
-'qrc:///images/smileys/core/smiley-brokenheart.gif'},
+            {name:'&lt;/3',url:
+                'qrc:///images/smileys/core/smiley-brokenheart.gif'},
 
-{name:':-)',url:
-'qrc:///images/smileys/core/smiley-smile.gif'},
+            {name:':-)',url:
+                'qrc:///images/smileys/core/smiley-smile.gif'},
 
-{name:';-)',url:
-'qrc:///images/smileys/core/smiley-wink.gif'},
+            {name:';-)',url:
+                'qrc:///images/smileys/core/smiley-wink.gif'},
 
-{name:':-(',url:
-'qrc:///images/smileys/core/smiley-frown.gif'},
+            {name:':-(',url:
+                'qrc:///images/smileys/core/smiley-frown.gif'},
 
-{name:':-P',url:
-'qrc:///images/smileys/core/smiley-tongue-out.gif'},
+            {name:':-P',url:
+                'qrc:///images/smileys/core/smiley-tongue-out.gif'},
 
-{name:':-X',url:
-'qrc:///images/smileys/core/smiley-kiss.gif'},
+            {name:':-X',url:
+                'qrc:///images/smileys/core/smiley-kiss.gif'},
 
-{name:':-D',url:
-'qrc:///images/smileys/core/smiley-laughing.gif'},
+            {name:':-D',url:
+                'qrc:///images/smileys/core/smiley-laughing.gif'},
 
-{name:':-O',url:
-'qrc:///images/smileys/core/smiley-surprised.gif'},
+            {name:':-O',url:
+                'qrc:///images/smileys/core/smiley-surprised.gif'},
 
-{name:'\\o/',url:
-'qrc:///images/smileys/core/smiley-thumbsup.gif'},
+            {name:'\\o/',url:
+                'qrc:///images/smileys/core/smiley-thumbsup.gif'},
 
-{name:'o.O',url:
-'qrc:///images/smileys/core/smiley-Oo.gif'},
+            {name:'o.O',url:
+                'qrc:///images/smileys/core/smiley-Oo.gif'},
 
-{name:":'(",url:
-'qrc:///images/smileys/core/smiley-cry.gif'},
+            {name:":'(",url:
+                'qrc:///images/smileys/core/smiley-cry.gif'},
 
-{name:":-!",url:
-'qrc:///images/smileys/core/smiley-foot-in-mouth.gif'},
+            {name:":-!",url:
+                'qrc:///images/smileys/core/smiley-foot-in-mouth.gif'},
 
-{name:":-/",url:
-'qrc:///images/smileys/core/smiley-undecided.gif'},
+            {name:":-/",url:
+                'qrc:///images/smileys/core/smiley-undecided.gif'},
 
-{name:":-[",url:
-'qrc:///images/smileys/core/smiley-embarassed.gif'},
+            {name:":-[",url:
+                'qrc:///images/smileys/core/smiley-embarassed.gif'},
 
-{name:"8-)",url:
-'qrc:///images/smileys/core/smiley-cool.gif'},
+            {name:"8-)",url:
+                'qrc:///images/smileys/core/smiley-cool.gif'},
 
-{name:':beer',url:
-'qrc:///images/smileys/core/beer_mug.gif'},
+            {name:':beer',url:
+                'qrc:///images/smileys/core/beer_mug.gif'},
 
-{name:':coffee',url:
-'qrc:///images/smileys/core/coffee.gif'},
+            {name:':coffee',url:
+                'qrc:///images/smileys/core/coffee.gif'},
 
-{name:':facepalm',url:
-'qrc:///images/smileys/core/smiley-facepalm.gif'},
+            {name:':facepalm',url:
+                'qrc:///images/smileys/core/smiley-facepalm.gif'},
 
-{name:':like',url:
-'qrc:///images/smileys/core/like.gif'},
+            {name:':like',url:
+                'qrc:///images/smileys/core/like.gif'},
 
-{name:':dislike',url:
-'qrc:///images/smileys/core/dislike.gif'},
+            {name:':dislike',url:
+                'qrc:///images/smileys/core/dislike.gif'},
 
-{name:'~friendica',url:
-'qrc:///images/smileys/core/friendica-16.png'},
+            {name:'~friendica',url:
+                'qrc:///images/smileys/core/friendica-16.png'},
 
-{name:'red#',url:
-'qrc:///images/smileys/core/rm-16.png'}
-]
+            {name:'red#',url:
+                'qrc:///images/smileys/core/rm-16.png'}
+        ]
 
 
 var addon=[
-{name:':bunnyflowers',url:
-'qrc:///images/smileys/animals/bunnyflowers.gif'},
+            {name:':bunnyflowers',url:
+                'qrc:///images/smileys/animals/bunnyflowers.gif'},
 
- {name:':chick',url:
-'qrc:///images/smileys/animals/chick.gif'},
+            {name:':chick',url:
+                'qrc:///images/smileys/animals/chick.gif'},
 
- {name:':bumblebee',url:
-'qrc:///images/smileys/animals/bee.gif'},
+            {name:':bumblebee',url:
+                'qrc:///images/smileys/animals/bee.gif'},
 
- {name:':ladybird',url:
-'qrc:///images/smileys/animals/ladybird.gif'},
+            {name:':ladybird',url:
+                'qrc:///images/smileys/animals/ladybird.gif'},
 
- {name:':bigspider',url:
-'qrc:///images/smileys/animals/bigspider.gif' },
+            {name:':bigspider',url:
+                'qrc:///images/smileys/animals/bigspider.gif' },
 
- {name:':cat',url:
-'qrc:///images/smileys/animals/cat.gif'},	
+            {name:':cat',url:
+                'qrc:///images/smileys/animals/cat.gif'},
 
- {name:':bunny',url:
-'qrc:///images/smileys/animals/bunny.gif' },
+            {name:':bunny',url:
+                'qrc:///images/smileys/animals/bunny.gif' },
 
- {name:':cow',url:
-'qrc:///images/smileys/animals/cow.gif' },
-    
- {name:':crab',url:
-'qrc:///images/smileys/animals/crab.gif' },
+            {name:':cow',url:
+                'qrc:///images/smileys/animals/cow.gif' },
 
- {name:':dolphin',url:
-'qrc:///images/smileys/animals/dolphin.gif' },
+            {name:':crab',url:
+                'qrc:///images/smileys/animals/crab.gif' },
 
- {name:':dragonfly',url:
-'qrc:///images/smileys/animals/dragonfly.gif' },
+            {name:':dolphin',url:
+                'qrc:///images/smileys/animals/dolphin.gif' },
 
- {name:':frog',url:
-'qrc:///images/smileys/animals/frog.gif'},
+            {name:':dragonfly',url:
+                'qrc:///images/smileys/animals/dragonfly.gif' },
 
- {name:':hamster',url:
-'qrc:///images/smileys/animals/hamster.gif' },
+            {name:':frog',url:
+                'qrc:///images/smileys/animals/frog.gif'},
 
- {name:':monkey',url:
-'qrc:///images/smileys/animals/monkey.gif' },
+            {name:':hamster',url:
+                'qrc:///images/smileys/animals/hamster.gif' },
 
- {name:':horse',url:
-'qrc:///images/smileys/animals/horse.gif' },
-  
- {name:':parrot',url:
-'qrc:///images/smileys/animals/parrot.gif' },
+            {name:':monkey',url:
+                'qrc:///images/smileys/animals/monkey.gif' },
 
- {name:':tux',url:
-'qrc:///images/smileys/animals/tux.gif' },
+            {name:':horse',url:
+                'qrc:///images/smileys/animals/horse.gif' },
 
- {name:':snail',url:
-'qrc:///images/smileys/animals/snail.gif' },
+            {name:':parrot',url:
+                'qrc:///images/smileys/animals/parrot.gif' },
 
- {name:':sheep',url:
-'qrc:///images/smileys/animals/sheep.gif' },
+            {name:':tux',url:
+                'qrc:///images/smileys/animals/tux.gif' },
 
- {name:':dog',url:
-'qrc:///images/smileys/animals/dog.gif'},
+            {name:':snail',url:
+                'qrc:///images/smileys/animals/snail.gif' },
 
- {name:':elephant',url:
-'qrc:///images/smileys/animals/elephant.gif' },
+            {name:':sheep',url:
+                'qrc:///images/smileys/animals/sheep.gif' },
 
- {name:':fish',url:
-'qrc:///images/smileys/animals/fish.gif' },
+            {name:':dog',url:
+                'qrc:///images/smileys/animals/dog.gif'},
 
- {name:':giraffe',url:
-'qrc:///images/smileys/animals/giraffe.gif' },
+            {name:':elephant',url:
+                'qrc:///images/smileys/animals/elephant.gif' },
 
- {name:':pig',url:
-'qrc:///images/smileys/animals/pig.gif'},
+            {name:':fish',url:
+                'qrc:///images/smileys/animals/fish.gif' },
 
-//Baby 
+            {name:':giraffe',url:
+                'qrc:///images/smileys/animals/giraffe.gif' },
 
- {name:':baby',url:
-'qrc:///images/smileys/babies/baby.gif' },
+            {name:':pig',url:
+                'qrc:///images/smileys/animals/pig.gif'},
 
- {name:':babycot',url:
-'qrc:///images/smileys/babies/babycot.gif' },
-	
+            //Baby
 
- {name:':pregnant',url:
-'qrc:///images/smileys/babies/pregnant.gif' },
+            {name:':baby',url:
+                'qrc:///images/smileys/babies/baby.gif' },
 
- {name:':stork',url:
-'qrc:///images/smileys/babies/stork.gif' },
+            {name:':babycot',url:
+                'qrc:///images/smileys/babies/babycot.gif' },
 
 
-//Confused 
- {name:':confused',url:
-'qrc:///images/smileys/confused/confused.gif' },
-    
- {name:':shrug',url:
-'qrc:///images/smileys/confused/shrug.gif' },
+            {name:':pregnant',url:
+                'qrc:///images/smileys/babies/pregnant.gif' },
 
- {name:':stupid',url:
-'qrc:///images/smileys/confused/stupid.gif' },
+            {name:':stork',url:
+                'qrc:///images/smileys/babies/stork.gif' },
 
- {name:':dazed',url:
-'qrc:///images/smileys/confused/dazed.gif' },
-//Cool 'qrc:///images/smileys
 
- {name:':affro',url:
-'qrc:///images/smileys/cool/affro.gif'},
+            //Confused
+            {name:':confused',url:
+                'qrc:///images/smileys/confused/confused.gif' },
 
-//Devil/Angel 
+            {name:':shrug',url:
+                'qrc:///images/smileys/confused/shrug.gif' },
 
- {name:':angel',url:
-'qrc:///images/smileys/devilangel/angel.gif'},
+            {name:':stupid',url:
+                'qrc:///images/smileys/confused/stupid.gif' },
 
- {name:':cherub',url:
-'qrc:///images/smileys/devilangel/cherub.gif'},
+            {name:':dazed',url:
+                'qrc:///images/smileys/confused/dazed.gif' },
+            //Cool 'qrc:///images/smileys
 
- {name:':devilangel',url:
-'qrc:///images/smileys/devilangel/blondedevil.gif' },
- {name:':catdevil',url:
-'qrc:///images/smileys/devilangel/catdevil.gif'},
+            {name:':affro',url:
+                'qrc:///images/smileys/cool/affro.gif'},
 
- {name:':devillish',url:
-'qrc:///images/smileys/devilangel/devil.gif'},
-	
- {name:':daseesaw',url:
-'qrc:///images/smileys/devilangel/daseesaw.gif'},
+            //Devil/Angel
 
- {name:':turnevil',url:
-'qrc:///images/smileys/devilangel/turnevil.gif' },
-	
- {name:':saint',url:
-'qrc:///images/smileys/devilangel/saint.gif'},
+            {name:':angel',url:
+                'qrc:///images/smileys/devilangel/angel.gif'},
 
- {name:':graveside',url:
-'qrc:///images/smileys/devilangel/graveside.gif'},
+            {name:':cherub',url:
+                'qrc:///images/smileys/devilangel/cherub.gif'},
 
-//Unpleasent 
+            {name:':devilangel',url:
+                'qrc:///images/smileys/devilangel/blondedevil.gif' },
+            {name:':catdevil',url:
+                'qrc:///images/smileys/devilangel/catdevil.gif'},
 
- {name:':toilet',url:
-'qrc:///images/smileys/disgust/toilet.gif'},
+            {name:':devillish',url:
+                'qrc:///images/smileys/devilangel/devil.gif'},
 
- {name:':fartinbed',url:
-'qrc:///images/smileys/disgust/fartinbed.gif' },
+            {name:':daseesaw',url:
+                'qrc:///images/smileys/devilangel/daseesaw.gif'},
 
- {name:':fartblush',url:
-'qrc:///images/smileys/disgust/fartblush.gif' },
+            {name:':turnevil',url:
+                'qrc:///images/smileys/devilangel/turnevil.gif' },
 
-//Drinks
+            {name:':saint',url:
+                'qrc:///images/smileys/devilangel/saint.gif'},
 
- {name:':tea',url:
-'qrc:///images/smileys/drink/tea.gif' },
+            {name:':graveside',url:
+                'qrc:///images/smileys/devilangel/graveside.gif'},
 
- {name:':drool',url:
-'qrc:///images/smileys/drool/drool.gif'},
+            //Unpleasent
 
-//Sad 
+            {name:':toilet',url:
+                'qrc:///images/smileys/disgust/toilet.gif'},
 
- {name:':crying',url:
-'qrc:///images/smileys/sad/crying.png'},
+            {name:':fartinbed',url:
+                'qrc:///images/smileys/disgust/fartinbed.gif' },
 
- {name:':prisoner',url:
-'qrc:///images/smileys/sad/prisoner.gif' },
+            {name:':fartblush',url:
+                'qrc:///images/smileys/disgust/fartblush.gif' },
 
- {name:':sigh',url:
-'qrc:///images/smileys/sad/sigh.gif'},
+            //Drinks
 
-//Smoking - only one smiley in here, maybe it needs moving elsewhere?
+            {name:':tea',url:
+                'qrc:///images/smileys/drink/tea.gif' },
 
- {name:':smoking',url:
-'qrc:///images/smileys/smoking/smoking.gif'},
+            {name:':drool',url:
+                'qrc:///images/smileys/drool/drool.gif'},
 
-//Sport
+            //Sad
 
- {name:':basketball',url:
-'qrc:///images/smileys/sport/basketball.gif'},
+            {name:':crying',url:
+                'qrc:///images/smileys/sad/crying.png'},
 
- {name:':bowling',url:
-'qrc:///images/smileys/sport/bowling.gif'},
+            {name:':prisoner',url:
+                'qrc:///images/smileys/sad/prisoner.gif' },
 
- {name:':cycling',url:
-'qrc:///images/smileys/sport/cycling.gif'},
+            {name:':sigh',url:
+                'qrc:///images/smileys/sad/sigh.gif'},
 
- {name:':darts',url:
-'qrc:///images/smileys/sport/darts.gif'},
+            //Smoking - only one smiley in here, maybe it needs moving elsewhere?
 
- {name:':fencing',url:
-'qrc:///images/smileys/sport/fencing.gif' },
+            {name:':smoking',url:
+                'qrc:///images/smileys/smoking/smoking.gif'},
 
- {name:':juggling',url:
-'qrc:///images/smileys/sport/juggling.gif'},
+            //Sport
 
- {name:':skipping',url:
-'qrc:///images/smileys/sport/skipping.gif'},
+            {name:':basketball',url:
+                'qrc:///images/smileys/sport/basketball.gif'},
 
- {name:':archery',url:
-'qrc:///images/smileys/sport/archery.gif'},
+            {name:':bowling',url:
+                'qrc:///images/smileys/sport/bowling.gif'},
 
- {name:':surfing',url:
-'qrc:///images/smileys/sport/surfing.gif' },
+            {name:':cycling',url:
+                'qrc:///images/smileys/sport/cycling.gif'},
 
- {name:':snooker',url:
-'qrc:///images/smileys/sport/snooker.gif' },
-  
- {name:':horseriding',url:
-'qrc:///images/smileys/sport/horseriding.gif'},
+            {name:':darts',url:
+                'qrc:///images/smileys/sport/darts.gif'},
 
-//Love 
+            {name:':fencing',url:
+                'qrc:///images/smileys/sport/fencing.gif' },
 
- {name:':iloveyou',url:
-'qrc:///images/smileys/love/iloveyou.gif'},
+            {name:':juggling',url:
+                'qrc:///images/smileys/sport/juggling.gif'},
 
- {name:':inlove',url:
-'qrc:///images/smileys/love/inlove.gif'},
+            {name:':skipping',url:
+                'qrc:///images/smileys/sport/skipping.gif'},
 
- {name:':~love',url:
-'qrc:///images/smileys/love/love.gif' },
+            {name:':archery',url:
+                'qrc:///images/smileys/sport/archery.gif'},
 
- {name:':lovebear',url:
-'qrc:///images/smileys/love/lovebear.gif'},
+            {name:':surfing',url:
+                'qrc:///images/smileys/sport/surfing.gif' },
 
- {name:':lovebed',url:
-'qrc:///images/smileys/love/lovebed.gif' },
+            {name:':snooker',url:
+                'qrc:///images/smileys/sport/snooker.gif' },
 
- {name:':loveheart',url:
-'qrc:///images/smileys/love/loveheart.gif' },
+            {name:':horseriding',url:
+                'qrc:///images/smileys/sport/horseriding.gif'},
 
-//Tired/Sleep 
+            //Love
 
- {name:':countsheep',url:
-'qrc:///images/smileys/tired/countsheep.gif' },
+            {name:':iloveyou',url:
+                'qrc:///images/smileys/love/iloveyou.gif'},
 
- {name:':hammock',url:
-'qrc:///images/smileys/tired/hammock.gif'},
+            {name:':inlove',url:
+                'qrc:///images/smileys/love/inlove.gif'},
 
- {name:':pillow',url:
-'qrc:///images/smileys/tired/pillow.gif' },
+            {name:':~love',url:
+                'qrc:///images/smileys/love/love.gif' },
 
- {name:':yawn',url:
-'qrc:///images/smileys/tired/yawn.gif'},
+            {name:':lovebear',url:
+                'qrc:///images/smileys/love/lovebear.gif'},
 
-//Fight/Flame/Violent 
+            {name:':lovebed',url:
+                'qrc:///images/smileys/love/lovebed.gif' },
 
- {name:':2guns',url:
-'qrc:///images/smileys/fight/2guns.gif' },
+            {name:':loveheart',url:
+                'qrc:///images/smileys/love/loveheart.gif' },
 
- {name:':alienfight',url:
-'qrc:///images/smileys/fight/alienfight.gif' },
+            //Tired/Sleep
 
- {name:':army',url:
-'qrc:///images/smileys/fight/army.gif'},
+            {name:':countsheep',url:
+                'qrc:///images/smileys/tired/countsheep.gif' },
 
- {name:':arrowhead',url:
-'qrc:///images/smileys/fight/arrowhead.gif'},
+            {name:':hammock',url:
+                'qrc:///images/smileys/tired/hammock.gif'},
 
- {name:':bfg',url:
-'qrc:///images/smileys/fight/bfg.gif' },
+            {name:':pillow',url:
+                'qrc:///images/smileys/tired/pillow.gif' },
 
- {name:':bowman',url:
-'qrc:///images/smileys/fight/bowman.gif' },
+            {name:':yawn',url:
+                'qrc:///images/smileys/tired/yawn.gif'},
 
- {name:':chainsaw',url:
-'qrc:///images/smileys/fight/chainsaw.gif'},
+            //Fight/Flame/Violent
 
- {name:':crossbow',url:
-'qrc:///images/smileys/fight/crossbow.gif'},
+            {name:':2guns',url:
+                'qrc:///images/smileys/fight/2guns.gif' },
 
- {name:':crusader',url:
-'qrc:///images/smileys/fight/crusader.gif' },
+            {name:':alienfight',url:
+                'qrc:///images/smileys/fight/alienfight.gif' },
 
- {name:':dead',url:
-'qrc:///images/smileys/fight/dead.gif' },
+            {name:':army',url:
+                'qrc:///images/smileys/fight/army.gif'},
 
- {name:':hammersplat',url:
-'qrc:///images/smileys/fight/hammersplat.gif' },
+            {name:':arrowhead',url:
+                'qrc:///images/smileys/fight/arrowhead.gif'},
 
- {name:':lasergun',url:
-'qrc:///images/smileys/fight/lasergun.gif' },
+            {name:':bfg',url:
+                'qrc:///images/smileys/fight/bfg.gif' },
 
- {name:':machinegun',url:
-'qrc:///images/smileys/fight/machinegun.gif' },
+            {name:':bowman',url:
+                'qrc:///images/smileys/fight/bowman.gif' },
 
- {name:':acid',url:
-'qrc:///images/smileys/fight/acid.gif' },
+            {name:':chainsaw',url:
+                'qrc:///images/smileys/fight/chainsaw.gif'},
 
-//Fantasy - monsters and dragons fantasy.  The other type of fantasy belongs in adult 
+            {name:':crossbow',url:
+                'qrc:///images/smileys/fight/crossbow.gif'},
 
- {name:':alienmonster',url:
-'qrc:///images/smileys/fantasy/alienmonster.gif' },
+            {name:':crusader',url:
+                'qrc:///images/smileys/fight/crusader.gif' },
 
- {name:':barbarian',url:
-'qrc:///images/smileys/fantasy/barbarian.gif' },
+            {name:':dead',url:
+                'qrc:///images/smileys/fight/dead.gif' },
 
- {name:':dinosaur',url:
-'qrc:///images/smileys/fantasy/dinosaur.gif'},
+            {name:':hammersplat',url:
+                'qrc:///images/smileys/fight/hammersplat.gif' },
 
- {name:':dragon',url:
-'qrc:///images/smileys/fantasy/dragon.gif'},
+            {name:':lasergun',url:
+                'qrc:///images/smileys/fight/lasergun.gif' },
 
- {name:':draco',url:
-'qrc:///images/smileys/fantasy/dragonwhelp.gif'},
+            {name:':machinegun',url:
+                'qrc:///images/smileys/fight/machinegun.gif' },
 
- {name:':ghost',url:
-'qrc:///images/smileys/fantasy/ghost.gif'},
+            {name:':acid',url:
+                'qrc:///images/smileys/fight/acid.gif' },
 
- {name:':mummy',url:
-'qrc:///images/smileys/fantasy/mummy.gif'},
+            //Fantasy - monsters and dragons fantasy.  The other type of fantasy belongs in adult
 
-//Food 
+            {name:':alienmonster',url:
+                'qrc:///images/smileys/fantasy/alienmonster.gif' },
 
- {name:':apple',url:
-'qrc:///images/smileys/food/apple.gif' },
+            {name:':barbarian',url:
+                'qrc:///images/smileys/fantasy/barbarian.gif' },
 
- {name:':broccoli',url:
-'qrc:///images/smileys/food/broccoli.gif' },
+            {name:':dinosaur',url:
+                'qrc:///images/smileys/fantasy/dinosaur.gif'},
 
- {name:':cake',url:
-'qrc:///images/smileys/food/cake.gif'},
+            {name:':dragon',url:
+                'qrc:///images/smileys/fantasy/dragon.gif'},
 
- {name:':carrot',url:
-'qrc:///images/smileys/food/carrot.gif' },
+            {name:':draco',url:
+                'qrc:///images/smileys/fantasy/dragonwhelp.gif'},
 
- {name:':popcorn',url:
-'qrc:///images/smileys/food/popcorn.gif'},
+            {name:':ghost',url:
+                'qrc:///images/smileys/fantasy/ghost.gif'},
 
- {name:':tomato',url:
-'qrc:///images/smileys/food/tomato.gif'},
+            {name:':mummy',url:
+                'qrc:///images/smileys/fantasy/mummy.gif'},
 
- {name:':banana',url:
-'qrc:///images/smileys/food/banana.gif'},
+            //Food
 
- {name:':cooking',url:
-'qrc:///images/smileys/food/cooking.gif'},
+            {name:':apple',url:
+                'qrc:///images/smileys/food/apple.gif' },
 
- {name:':fryegg',url:
-'qrc:///images/smileys/food/fryegg.gif'},
+            {name:':broccoli',url:
+                'qrc:///images/smileys/food/broccoli.gif' },
 
- {name:':birthdaycake',url:
-'qrc:///images/smileys/food/birthdaycake.gif'},
+            {name:':cake',url:
+                'qrc:///images/smileys/food/cake.gif'},
 
-//Happy 
+            {name:':carrot',url:
+                'qrc:///images/smileys/food/carrot.gif' },
 
- {name:':cloud9',url:
-'qrc:///images/smileys/happy/cloud9.gif'},
+            {name:':popcorn',url:
+                'qrc:///images/smileys/food/popcorn.gif'},
 
- {name:':tearsofjoy',url:
-'qrc:///images/smileys/happy/tearsofjoy.gif' },
+            {name:':tomato',url:
+                'qrc:///images/smileys/food/tomato.gif'},
 
-//Repsect 
+            {name:':banana',url:
+                'qrc:///images/smileys/food/banana.gif'},
 
- {name:':bow',url:
-'qrc:///images/smileys/respect/bow.gif'},
+            {name:':cooking',url:
+                'qrc:///images/smileys/food/cooking.gif'},
 
- {name:':bravo',url:
-'qrc:///images/smileys/respect/bravo.gif'},
+            {name:':fryegg',url:
+                'qrc:///images/smileys/food/fryegg.gif'},
 
- {name:':hailking',url:
-'qrc:///images/smileys/respect/hailking.gif'},
+            {name:':birthdaycake',url:
+                'qrc:///images/smileys/food/birthdaycake.gif'},
 
- {name:':number1',url:
-'qrc:///images/smileys/respect/number1.gif' },
+            //Happy
 
-//Laugh 
+            {name:':cloud9',url:
+                'qrc:///images/smileys/happy/cloud9.gif'},
 
- {name:':hahaha',url:
-'qrc:///images/smileys/laugh/hahaha.gif'},
+            {name:':tearsofjoy',url:
+                'qrc:///images/smileys/happy/tearsofjoy.gif' },
 
- {name:':loltv',url:
-'qrc:///images/smileys/laugh/loltv.gif' },
+            //Repsect
 
- {name:':rofl',url:
-'qrc:///images/smileys/laugh/rofl.gif'},
+            {name:':bow',url:
+                'qrc:///images/smileys/respect/bow.gif'},
 
-//Music 
+            {name:':bravo',url:
+                'qrc:///images/smileys/respect/bravo.gif'},
 
- {name:':drums',url:
-'qrc:///images/smileys/music/drums.gif'},
+            {name:':hailking',url:
+                'qrc:///images/smileys/respect/hailking.gif'},
 
+            {name:':number1',url:
+                'qrc:///images/smileys/respect/number1.gif' },
 
- {name:':guitar',url:
-'qrc:///images/smileys/music/guitar.gif'},
+            //Laugh
 
- {name:':trumpet',url:
-'qrc:///images/smileys/music/trumpet.gif' },
+            {name:':hahaha',url:
+                'qrc:///images/smileys/laugh/hahaha.gif'},
 
-//smileys that used to be in core
+            {name:':loltv',url:
+                'qrc:///images/smileys/laugh/loltv.gif' },
 
- {name:':headbang',url:
-'qrc:///images/smileys/oldcore/headbang.gif'},
+            {name:':rofl',url:
+                'qrc:///images/smileys/laugh/rofl.gif'},
 
- {name:':beard',url:
-'qrc:///images/smileys/oldcore/beard.png'},
+            //Music
 
- {name:':whitebeard',url:
-'qrc:///images/smileys/oldcore/whitebeard.png'},
+            {name:':drums',url:
+                'qrc:///images/smileys/music/drums.gif'},
 
- {name:':shaka',url:
-'qrc:///images/smileys/oldcore/shaka.gif'},
 
- {name:':\\.../',url:
-'qrc:///images/smileys/oldcore/shaka.gif'},
+            {name:':guitar',url:
+                'qrc:///images/smileys/music/guitar.gif'},
 
- {name:':\\ooo/',url:
-'qrc:///images/smileys/oldcore/shaka.gif' },
+            {name:':trumpet',url:
+                'qrc:///images/smileys/music/trumpet.gif' },
 
- {name:':headdesk',url:
-'qrc:///images/smileys/oldcore/headbang.gif' },
+            //smileys that used to be in core
 
-//These two are still in core, so oldcore isn't strictly right, but we don't want too many directories
+            {name:':headbang',url:
+                'qrc:///images/smileys/oldcore/headbang.gif'},
 
- {name:':-d',url:
-'qrc:///images/smileys/oldcore/laughing.gif'},
+            {name:':beard',url:
+                'qrc:///images/smileys/oldcore/beard.png'},
 
- {name:':-o',url:
-'qrc:///images/smileys/oldcore/surprised.gif' },
+            {name:':whitebeard',url:
+                'qrc:///images/smileys/oldcore/whitebeard.png'},
 
-// Regex killers - stick these at the bottom so they appear at the end of the English and 
-// at the start of $OtherLanguage.
+            {name:':shaka',url:
+                'qrc:///images/smileys/oldcore/shaka.gif'},
 
- {name:':cool',url:
-'qrc:///images/smileys/cool/cool.gif' },	
+            {name:':\\.../',url:
+                'qrc:///images/smileys/oldcore/shaka.gif'},
 
- {name:':vomit',url:
-'qrc:///images/smileys/disgust/vomit.gif' },
+            {name:':\\ooo/',url:
+                'qrc:///images/smileys/oldcore/shaka.gif' },
 
- {name:':golf',url:
-'qrc:///images/smileys/sport/golf.gif' },
-	
- {name:':football',url:
-'qrc:///images/smileys/sport/football.gif'},
+            {name:':headdesk',url:
+                'qrc:///images/smileys/oldcore/headbang.gif' },
 
- {name:':tennis',url:
-'qrc:///images/smileys/sport/tennis.gif' },
+            //These two are still in core, so oldcore isn't strictly right, but we don't want too many directories
 
- {name:':alpha',url:
-'qrc:///images/smileys/fight/alpha.png' },
+            {name:':-d',url:
+                'qrc:///images/smileys/oldcore/laughing.gif'},
 
- {name:':marine',url:
-'qrc:///images/smileys/fight/marine.gif' },
+            {name:':-o',url:
+                'qrc:///images/smileys/oldcore/surprised.gif' },
 
- {name:':sabre',url:
-'qrc:///images/smileys/fight/sabre.gif' },
+            // Regex killers - stick these at the bottom so they appear at the end of the English and
+            // at the start of $OtherLanguage.
 
- {name:':tank',url:
-'qrc:///images/smileys/fight/tank.gif' },
+            {name:':cool',url:
+                'qrc:///images/smileys/cool/cool.gif' },
 
- {name:':viking',url:
-'qrc:///images/smileys/fight/viking.gif' },
+            {name:':vomit',url:
+                'qrc:///images/smileys/disgust/vomit.gif' },
 
- {name:':gangs',url:
-'qrc:///images/smileys/fight/gangs.gif' },
+            {name:':golf',url:
+                'qrc:///images/smileys/sport/golf.gif' },
 
- {name:':dj',url:
-'qrc:///images/smileys/music/dj.gif'},
+            {name:':football',url:
+                'qrc:///images/smileys/sport/football.gif'},
 
- {name:':elvis',url:
-'qrc:///images/smileys/music/elvis.gif'},
+            {name:':tennis',url:
+                'qrc:///images/smileys/sport/tennis.gif' },
 
- {name:':violin',url:
-'qrc:///images/smileys/music/violin.gif'},
-]
+            {name:':alpha',url:
+                'qrc:///images/smileys/fight/alpha.png' },
+
+            {name:':marine',url:
+                'qrc:///images/smileys/fight/marine.gif' },
+
+            {name:':sabre',url:
+                'qrc:///images/smileys/fight/sabre.gif' },
+
+            {name:':tank',url:
+                'qrc:///images/smileys/fight/tank.gif' },
+
+            {name:':viking',url:
+                'qrc:///images/smileys/fight/viking.gif' },
+
+            {name:':gangs',url:
+                'qrc:///images/smileys/fight/gangs.gif' },
+
+            {name:':dj',url:
+                'qrc:///images/smileys/music/dj.gif'},
+
+            {name:':elvis',url:
+                'qrc:///images/smileys/music/elvis.gif'},
+
+            {name:':violin',url:
+                'qrc:///images/smileys/music/violin.gif'},
+        ]
 
 
 var adult=[
-{
-name:'(o)(o) ',url:
-'qrc:///images/smileys/adult/tits.gif'},
+            {
+                name:'(o)(o) ',url:
+                'qrc:///images/smileys/adult/tits.gif'},
 
-{name:'(.)(.) ',url:
-'qrc:///images/smileys/adult/tits.gif'},
+            {name:'(.)(.) ',url:
+                'qrc:///images/smileys/adult/tits.gif'},
 
-{name:':bong',url:
-'qrc:///images/smileys/adult/bong.gif'},
+            {name:':bong',url:
+                'qrc:///images/smileys/adult/bong.gif'},
 
-{name:':sperm',url:
-'qrc:///images/smileys/adult/sperm.gif'},
+            {name:':sperm',url:
+                'qrc:///images/smileys/adult/sperm.gif'},
 
-{name:':drunk',url:
-'qrc:///images/smileys/adult/drunk.gif'},
+            {name:':drunk',url:
+                'qrc:///images/smileys/adult/drunk.gif'},
 
-{name:':finger',url:
-'qrc:///images/smileys/adult/finger.gif'}
-]
+            {name:':finger',url:
+                'qrc:///images/smileys/adult/finger.gif'}
+        ]
diff --git a/source-linux/qml/configqml/InfoBox.qml b/source-linux/qml/configqml/InfoBox.qml
index d78655f..2791f12 100644
--- a/source-linux/qml/configqml/InfoBox.qml
+++ b/source-linux/qml/configqml/InfoBox.qml
@@ -43,7 +43,7 @@ Page{
         font.pointSize: osSettings.systemFontSize
         color:Material.primaryTextColor
         wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-        text: "<b>Friendiqa v0.6.4 </b><br>Licensed under GPL 3 with the exception of OpenSSL <br> "+
+        text: "<b>Friendiqa v0.6.5 </b><br>Licensed under GPL 3 with the exception of OpenSSL <br> "+
               "Website <a href='https://friendiqa.ma-nic.de'>https://friendiqa.ma-nic.de</a><br>"+
               "Sourcecode: <a href='https://git.friendi.ca/LubuWest/Friendiqa'>https://git.friendi.ca/LubuWest/Friendiqa</a><br>"+
               "Privacy Policy: <a href='https://git.friendi.ca/lubuwest/Friendiqa/src/branch/master/PrivacyPolicy.md'>http://git.friendi.ca/lubuwest/Friendiqa/src/branch/master/PrivacyPolicy.md</a><br>"+
diff --git a/source-linux/qml/newsqml/Conversation.qml b/source-linux/qml/newsqml/Conversation.qml
index a511617..39c8f5d 100644
--- a/source-linux/qml/newsqml/Conversation.qml
+++ b/source-linux/qml/newsqml/Conversation.qml
@@ -95,7 +95,7 @@ Page {
           //x:3*mm
           //y:8*mm
           width: conversationList.width//-4*mm
-          height:conversationList.height//-20*mm
+          height:conversationList.height-root.fontFactor*osSettings.bigFontSize//-20*mm
           clip: true
           spacing: 0
           footer: MessageSend{conversation:true}
diff --git a/source-linux/qml/newsqml/MessageSend.qml b/source-linux/qml/newsqml/MessageSend.qml
index 73587b3..219bf7c 100644
--- a/source-linux/qml/newsqml/MessageSend.qml
+++ b/source-linux/qml/newsqml/MessageSend.qml
@@ -89,27 +89,37 @@ Rectangle{
 
     function statusUpdate(title,status,in_reply_to_status_id,attachImageURL) {
         //xhr.url= login.server + "/api/statuses/update.json";
-        try{newsBusy.running=true;}catch(e){conversationBusy.running=true}
+        try{newsBusy.running=true;conversationBusy.running=true}catch(e){}
         xhr.setLogin(login.username+":"+Qt.atob(login.password));
         xhr.setUrl(login.server);
-        xhr.setApi("/api/statuses/update");
-        xhr.clearParams();
-        xhr.setParam("source", "Friendiqa");
-        xhr.setParam("htmlstatus", status);
-        if (parentId!="") {xhr.setParam("in_reply_to_status_id", parentId)};
-        if (title!=="") {xhr.setParam("title", title)};
-        if (group_allow.length>0) {xhr.setParam("group_allow", Helperjs.cleanArray(group_allow))};
-        if (group_deny.length>0) {xhr.setParam("group_deny",  Helperjs.cleanArray(group_deny))};
-        if (contact_allow.length>0) {xhr.setParam("contact_allow", Helperjs.cleanArray(contact_allow))};
-        if (contact_deny.length>0) {xhr.setParam("contact_deny",  Helperjs.cleanArray(contact_deny))};
-        if (attachImageURL.length>0) {
-            for (var image in attachImageURL){
-                xhr.setImageFileParam("media", attachImageURL[image]);
-                xhr.setImageFileParam("angle", rotator.angle.toString());
+        if (in_reply_to_status_id==""){
+            xhr.setApi("/api/statuses/update");
+            xhr.clearParams();
+            xhr.setParam("source", "Friendiqa");
+            xhr.setParam("htmlstatus", status);
+            if (parentId!="") {xhr.setParam("in_reply_to_status_id", parentId)};
+            if (title!=="") {xhr.setParam("title", title)};
+            if (group_allow.length>0) {xhr.setParam("group_allow", Helperjs.cleanArray(group_allow))};
+            if (group_deny.length>0) {xhr.setParam("group_deny",  Helperjs.cleanArray(group_deny))};
+            if (contact_allow.length>0) {xhr.setParam("contact_allow", Helperjs.cleanArray(contact_allow))};
+            if (contact_deny.length>0) {xhr.setParam("contact_deny",  Helperjs.cleanArray(contact_deny))};
+            if (attachImageURL.length>0) {
+                for (var image in attachImageURL){
+                    xhr.setImageFileParam("media", attachImageURL[image]);
+                    xhr.setImageFileParam("angle", rotator.angle.toString());
+                }
             }
-        };
-        xhr.post();
-        Newsjs.storeHashtags(login,db,status,root)
+            xhr.post();
+            Newsjs.storeHashtags(login,db,status,root)
+        }else {
+            xhr.setApi("/api/v1/statuses");
+            xhr.clearParams();
+            xhr.setParam("status", status);
+            xhr.setParam("in_reply_to_id", in_reply_to_status_id);
+            xhr.post();
+            Newsjs.storeHashtags(login,db,status,root)
+            messageSend.destroy()
+        }
     }
 
     function dmUpdate(title,text,replyto,screen_name,attachImageURL) {
@@ -124,7 +134,7 @@ Rectangle{
         if (parentId!="") {xhr.setParam("replyto", replyto)};
         //if (title!=="") {xhr.setParam("title", title)};
         xhr.post();
-        }
+    }
 
     function setParent(newsitemobject){
         if (newsitemobject!=""){
@@ -151,22 +161,22 @@ Rectangle{
                 contactModel.append({"contact":contacts[i]})
             }
             contactSelector.visible=true
-            },letter);
+        },letter);
     }
 
     function hashtagmenu(){
         Newsjs.listHashtags(login,db,function(tags){
             tagModel.clear();
             for (var i=0;i<tags.length;i++){
-               tagModel.append({"tag":tags[i]})
+                tagModel.append({"tag":tags[i]})
             }
             tagSelector.visible=true
-            });
+        });
     }
-//    Flickable{
-//        anchors.fill: parent
-//        contentHeight: messageColumn.height
-//        boundsBehavior: Flickable.StopAtBounds
+    //    Flickable{
+    //        anchors.fill: parent
+    //        contentHeight: messageColumn.height
+    //        boundsBehavior: Flickable.StopAtBounds
     DropArea{
         anchors.fill: parent
         onDropped: {
@@ -182,342 +192,349 @@ Rectangle{
             }
         }
     }
-        Column {
-            y:0.5*mm
-            id:messageColumn
-            spacing: 0.5*mm
+    Column {
+        y:0.5*mm
+        id:messageColumn
+        spacing: 0.5*mm
+        width: parent.width
+        height: 2.6*root.fontFactor*osSettings.bigFontSize+stackTypeDescription.height
+        Label{id:stackTypeDescription
             width: parent.width
-            height: 2.6*root.fontFactor*osSettings.bigFontSize+stackTypeDescription.height
-            Label{id:stackTypeDescription
-                width: parent.width
-                horizontalAlignment:Text.AlignHCenter
-                text: !conversation &&newsSwipeview.stacktype?qsTr(newsSwipeview.stacktype):""
-                font.pointSize: osSettings.bigFontSize
-            }
-            TextArea{
-                id:receiverLabel
-                width: messageColumn.width
-                font.pointSize: osSettings.bigFontSize
-                placeholderText:qsTr("to:")
-                text: ""
-                visible:false
-                onTextChanged: {
-                    if (text!=""){contactmenu(text)} else {var receiver=getText(0,cursorPosition);contactmenu(receiver+preeditText)}}
-            }
+            horizontalAlignment:Text.AlignHCenter
+            text: !conversation &&newsSwipeview.stacktype?qsTr(newsSwipeview.stacktype):""
+            font.pointSize: osSettings.bigFontSize
+        }
+        TextArea{
+            id:receiverLabel
+            width: messageColumn.width
+            font.pointSize: osSettings.bigFontSize
+            placeholderText:qsTr("to:")
+            text: ""
+            visible:false
+            onTextChanged: {
+                if (text!=""){contactmenu(text)} else {var receiver=getText(0,cursorPosition);contactmenu(receiver+preeditText)}}
+        }
 
-            TextField {
-                 id: titleField
-                 x: 0.5*mm
-                 width: parent.width-mm
-                 font.pointSize: osSettings.systemFontSize
-                 placeholderText: qsTr("Title (optional)")
-                 visible: false//(parentId === "") && (bodyField.length>1)
-                 onVisibleChanged: if ((visible==true)&&(conversation==true)){
-                    conversationView.contentY=conversationView.contentY+titleField.height
-                 }
-              }
+        TextField {
+            id: titleField
+            x: 0.5*mm
+            width: parent.width-mm
+            font.pointSize: osSettings.systemFontSize
+            placeholderText: qsTr("Title (optional)")
+            visible: false//(parentId === "") && (bodyField.length>1)
+            onVisibleChanged: if ((visible==true)&&(conversation==true)){
+                                  conversationView.contentY=conversationView.contentY+titleField.height
+                              }
+        }
 
-           Rectangle{
-               color: Material.backgroundColor
-               radius: 0.5*mm
-               visible:(conversation || (newsSwipeview.stacktype!="Notifications"))
-               x:mm
-               width: parent.width-2*mm
-               height:Math.max(bodyField.contentHeight+4*mm,2.5*root.fontFactor*osSettings.bigFontSize)
+        Rectangle{
+            color: Material.backgroundColor
+            radius: 0.5*mm
+            visible:(conversation || (newsSwipeview.stacktype!="Notifications"))
+            x:mm
+            width: parent.width-2*mm
+            height:Math.max(bodyField.contentHeight+4*mm,2.5*root.fontFactor*osSettings.bigFontSize)
 
-               TextArea {
-                    id: bodyField
-                    property string contactprefix:""
-                    property string placeholder: osSettings.osType=="Linux"? qsTr(" Drop your Content here."):""
-                    anchors.fill: parent
-                    font.pointSize: osSettings.systemFontSize
-                    font.family: "Noto Sans"
-                    wrapMode: Text.Wrap
-                    selectByMouse: true
-                    placeholderText: conversation?"": (qsTr("What's on your mind?")+placeholder)
-                    textFormat: TextEdit.RichText
-                    onLineCountChanged: {
+            TextArea {
+                id: bodyField
+                property string contactprefix:""
+                property string placeholder: osSettings.osType=="Linux"? qsTr(" Drop your Content here."):""
+                anchors.fill: parent
+                font.pointSize: osSettings.systemFontSize
+                font.family: "Noto Sans"
+                wrapMode: Text.Wrap
+                selectByMouse: true
+                placeholderText: conversation?"": (qsTr("What's on your mind?")+placeholder)
+                textFormat: TextEdit.RichText
+                onLineCountChanged: {
+                    if (messageSend.ListView.view==null){
+                        if (newsitem.ListView.view==null){}
+                        else {newsitem.ListView.view.contentY=newsitem.ListView.view.contentY+root.fontFactor*osSettings.systemFontSize}
+                    }
+                    if(conversation==true){
+                        conversationView.contentY=conversationView.contentY+root.fontFactor*osSettings.systemFontSize
+                    }
+                    else{
+                        messageSend.ListView.view.contentY=messageSend.ListView.view.contentY+root.fontFactor*osSettings.systemFontSize
+                    }
+                }
+                onLinkActivated:{Qt.openUrlExternally(link)}
+                onActiveFocusChanged:{
+                    if (activeFocus==true){
                         if (messageSend.ListView.view==null){
                             if (newsitem.ListView.view==null){}
-                            else {newsitem.ListView.view.contentY=newsitem.ListView.view.contentY+root.fontFactor*osSettings.systemFontSize}
+                            else {newsitem.ListView.view.contentY=newsitem.ListView.view.contentY+newsitem.height/2}
                         }
-                        if(conversation==true){
-                            conversationView.contentY=conversationView.contentY+root.fontFactor*osSettings.systemFontSize
+                        else if (conversation==true){
+                            if(parentId==""){setParent(conversationModel.get(0).newsitemobject);}
+                            messageSend.state="conversation";
+                            try{conversationView.contentY=conversationView.contentY+20*mm}catch(e){}
+                        } else  if (textfocus==false){
+                            messageSend.state="active";
+                            newsView.positionViewAtBeginning();
                         }
                         else{
-                            messageSend.ListView.view.contentY=messageSend.ListView.view.contentY+root.fontFactor*osSettings.systemFontSize
-                        }
+                            messageSend.ListView.view.contentY=messageSend.ListView.view.contentY+8*mm
+                        };
                     }
-                    onLinkActivated:{Qt.openUrlExternally(link)}
-                    onActiveFocusChanged:{
-                        if (activeFocus==true){
-                            if (messageSend.ListView.view==null){
-                                if (newsitem.ListView.view==null){}
-                                else {newsitem.ListView.view.contentY=newsitem.ListView.view.contentY+newsitem.height/2}
-                            }
-                            else if (conversation==true){
-                                if(parentId==""){setParent(conversationModel.get(0).newsitemobject);}
-                                messageSend.state="conversation";
-                                try{conversationView.contentY=conversationView.contentY+20*mm}catch(e){}
-                            } else  if (textfocus==false){
-                                messageSend.state="active";
-                                newsView.positionViewAtBeginning();
-                            }
-                            else{
-                                messageSend.ListView.view.contentY=messageSend.ListView.view.contentY+8*mm
-                            };
-                        }
-                    }
-                    onTextChanged:{
-                        if (text!=""){
-                            var plaintext=getText(0,cursorPosition)
-                            var regex1 = /@[a-z]+/;var regex2 = /\![a-z]+/;var regex3 = /\s/;
-                            if (regex1.test(getText(plaintext.lastIndexOf('@',cursorPosition),cursorPosition)+preeditText) && !regex3.test(getText(plaintext.lastIndexOf('@',cursorPosition),cursorPosition)+preeditText)){
-                                var letter=(getText(plaintext.lastIndexOf('@',cursorPosition),cursorPosition)).match(/[a-z]+/);
-                                contactprefix="@";
-                                contactmenu(letter.toString())
-                            } else if( regex2.test(getText(plaintext.lastIndexOf('!',cursorPosition),cursorPosition)+preeditText) && !regex3.test(getText(plaintext.lastIndexOf('!',cursorPosition),cursorPosition)+preeditText) ){
-                                var letter=(getText(plaintext.lastIndexOf('!',cursorPosition),cursorPosition)).match(/[a-z]+/);
-                                contactprefix="!";
-                                contactmenu(letter.toString())
-                            }else {contactSelector.visible=false}
-                        }else{contactSelector.visible=false}
-                    }
-              }
+                }
+                onTextChanged:{
+                    if (text!=""){
+                        var plaintext=getText(0,cursorPosition)
+                        var regex1 = /@[a-z]+/;var regex2 = /\![a-z]+/;var regex3 = /\s/;
+                        if (regex1.test(getText(plaintext.lastIndexOf('@',cursorPosition),cursorPosition)+preeditText) && !regex3.test(getText(plaintext.lastIndexOf('@',cursorPosition),cursorPosition)+preeditText)){
+                            var letter=(getText(plaintext.lastIndexOf('@',cursorPosition),cursorPosition)).match(/[a-z]+/);
+                            contactprefix="@";
+                            contactmenu(letter.toString())
+                        } else if( regex2.test(getText(plaintext.lastIndexOf('!',cursorPosition),cursorPosition)+preeditText) && !regex3.test(getText(plaintext.lastIndexOf('!',cursorPosition),cursorPosition)+preeditText) ){
+                            var letter=(getText(plaintext.lastIndexOf('!',cursorPosition),cursorPosition)).match(/[a-z]+/);
+                            contactprefix="!";
+                            contactmenu(letter.toString())
+                        }else {contactSelector.visible=false}
+                    }else{contactSelector.visible=false}
+                }
             }
+        }
 
-           ListView{
-               id:contactSelector
-               visible: false
-               z:3
-               x:2*root.fontFactor*osSettings.bigFontSize//8*mm
-               width: parent.width-2.2*root.fontFactor*osSettings.bigFontSize//9*mm
-               height: messageSend.height/2
-               model:contactModel
-               function processContactSelection(contact){
-                   if(Helperjs.getCount(db,login,"contacts","screen_name",contact.screen_name)>1){
-                       contact.screen_name=contact.screen_name+"+"+contacts.cid
-                   }
-                   if (newsSwipeview.stacktype=='DirectMessages'){
-                       receiverLabel.text=contact.screen_name;
-                       reply_to_user=contact.screen_name
-                   } else {
-                       bodyField.remove(bodyField.getText(0,bodyField.cursorPosition).lastIndexOf(bodyField.contactprefix,bodyField.cursorPosition),bodyField.cursorPosition);
-                       bodyField.insert(bodyField.cursorPosition, bodyField.contactprefix+contact.screen_name+" ");
-                       bodyField.cursorPosition=bodyField.cursorPosition+contact.screen_name.length+1
-                   }
-                   //receiverLabel.text=contact.screen_name;
-                   contactSelector.visible=false
-               }
-               delegate: ContactComponent { }
-           }
-           ListModel{id:contactModel}
+        ListView{
+            id:contactSelector
+            visible: false
+            z:3
+            x:2*root.fontFactor*osSettings.bigFontSize//8*mm
+            width: parent.width-2.2*root.fontFactor*osSettings.bigFontSize//9*mm
+            height: messageSend.height/2
+            model:contactModel
+            function processContactSelection(contact){
+                if(Helperjs.getCount(db,login,"contacts","screen_name",contact.screen_name)>1){
+                    contact.screen_name=contact.screen_name+"+"+contacts.cid
+                }
+                if (newsSwipeview.stacktype=='DirectMessages'){
+                    receiverLabel.text=contact.screen_name;
+                    reply_to_user=contact.screen_name
+                } else {
+                    bodyField.remove(bodyField.getText(0,bodyField.cursorPosition).lastIndexOf(bodyField.contactprefix,bodyField.cursorPosition),bodyField.cursorPosition);
+                    bodyField.insert(bodyField.cursorPosition, bodyField.contactprefix+contact.screen_name+" ");
+                    bodyField.cursorPosition=bodyField.cursorPosition+contact.screen_name.length+1
+                }
+                //receiverLabel.text=contact.screen_name;
+                contactSelector.visible=false
+            }
+            delegate: ContactComponent { }
+        }
+        ListModel{id:contactModel}
 
-           ListView{
-               id: tagSelector
-               visible: false
-               z:3
-               x:2*root.fontFactor*osSettings.bigFontSize//8*mm
-               width: parent.width-2.2*root.fontFactor*osSettings.bigFontSize//9*mm
-               height: messageSend.height/2
-               model:tagModel
-               clip: true
-               spacing: 0
-               function processTagSelection(hashtag){
-                   bodyField.insert(bodyField.cursorPosition, hashtag+" ");
-                   bodyField.cursorPosition=bodyField.cursorPosition+hashtag.length+1
-                   tagSelector.visible=false
-               }
-               delegate: MButton {text:tag;onClicked: tagSelector.processTagSelection(tag)}
-           }
-           ListModel{id:tagModel}
+        ListView{
+            id: tagSelector
+            visible: false
+            z:3
+            x:2*root.fontFactor*osSettings.bigFontSize//8*mm
+            width: parent.width-2.2*root.fontFactor*osSettings.bigFontSize//9*mm
+            height: messageSend.height/2
+            model:tagModel
+            clip: true
+            spacing: 0
+            function processTagSelection(hashtag){
+                bodyField.insert(bodyField.cursorPosition, hashtag+" ");
+                bodyField.cursorPosition=bodyField.cursorPosition+hashtag.length+1
+                tagSelector.visible=false
+            }
+            delegate: MButton {text:tag;onClicked: tagSelector.processTagSelection(tag)}
+        }
+        ListModel{id:tagModel}
 
-           Item{
-               id:imageAttachment;
-               property alias source:realimage.source
-               //property alias angle:rotator.angle
-               visible: source!=""
-               width: 45*mm
-               height: 45*mm;
-               MouseArea{
+        Item{
+            id:imageAttachment;
+            property alias source:realimage.source
+            //property alias angle:rotator.angle
+            visible: source!=""
+            width: 45*mm
+            height: 45*mm;
+            MouseArea{
                 anchors.fill: parent
                 onClicked: {
                     attachImageURLs.splice(attachImageURLs.indexOf(source),1);
                     imageAttachment.source=""
                 }
-               }
-               Image{id:realimage
-                   source:"";
-                   x:2*mm;
-                   width: 45*mm;
-                   height: source==""?0:45*mm;
-                   fillMode: Image.PreserveAspectFit;
-                   transform: Rotation {id:rotator; origin.x: 22.5*mm; origin.y: 22.5*mm; angle: 0}
+            }
+            Image{id:realimage
+                source:"";
+                x:2*mm;
+                width: 45*mm;
+                height: source==""?0:45*mm;
+                fillMode: Image.PreserveAspectFit;
+                transform: Rotation {id:rotator; origin.x: 22.5*mm; origin.y: 22.5*mm; angle: 0}
 
-               }
-               Rectangle{
-                   width: 5*mm
-                   height: 5*mm
-                   visible: imageAttachment.source!=""
-                   anchors.bottom: imageAttachment.bottom
-                   anchors.right: imageAttachment.right
-                   color: "black"
-                   opacity: 0.5
-                   Text{anchors.centerIn:parent;text: "\uf01e";color: "white"}
-                   MouseArea{
-                       anchors.fill:parent;
-                       onClicked:{
-                           rotator.angle+=90;
-                       }
-                   }
-               }
-           }
-
-          Row{
-              id:buttonRow
-              visible:false //(bodyField.length>1)||(attachImageURLs.length>0)
-              spacing: mm
-              height: 2.5*root.fontFactor*osSettings.bigFontSize//12*mm
-              x: 0.5*mm
-//              MButton{id:permButton //Permissions not working in Friendica 02/2022
-//                  visible: !conversation && (newsSwipeview.stacktype!=="DirectMessages")
-//                  height: 2*root.fontFactor*osSettings.bigFontSize
-//                  width: 2*root.fontFactor*osSettings.bigFontSize
-//                  text: ((contact_allow.length==0)&&(contact_deny.length==0)&&(group_allow.length==0)&&(group_deny.length==0))?"\uf09c":"\uf023"
-//                  onClicked: { if (permissionDialog.visible==false){permissionDialog.visible=true} else{permissionDialog.visible=false}}
-//              }
-              MButton {
-                  id: attachButton
-                  height: 2*root.fontFactor*osSettings.bigFontSize
-                  width: 2*root.fontFactor*osSettings.bigFontSize
-                  text: "\uf03e"
-                  visible:!conversation?(newsSwipeview.stacktype!="DirectMessages"):true
-                  onClicked: {
-                      if (attachImageURLs.length>0){//Server currently accepts only one attachment
-                          Helperjs.showMessage( qsTr("Error"),qsTr("Only one attachment supported at the moment.\n Remove other attachment first!"), messageColumn)
-                      }
-                      else{
-                          root.imagePicking=false;
-                          var imagePicker = Qt.createQmlObject('import QtQuick 2.0; import "qrc:/qml/genericqml";'+
-                          osSettings.imagePickQml+'{multiple : false;onReady: {attachImageURLs.push(imageUrl);'+
-                          'attachImage(imageUrl)}}',root,"imagePicker");
-                           imagePicker.pickImage()
-                      }
-                  }
-               }
-
-               MButton{
-                   id:smileyButton
-                   text: "\uf118"
-                   height: 2*root.fontFactor*osSettings.bigFontSize
-                   width: 2*root.fontFactor*osSettings.bigFontSize
-                   onClicked: {if (smileyDialog.visible==false){smileyDialog.visible=true} else{smileyDialog.visible=false}}
-               }
-
-               MButton{
-                   id:hastagButton
-                   text: "\uf292"
-                   height: 2*root.fontFactor*osSettings.bigFontSize
-                   width: 2*root.fontFactor*osSettings.bigFontSize
-                   onClicked: {if (tagSelector.visible==false){hashtagmenu()} else{tagSelector.visible=false}}
-               }
-
-               MButton {
-                   id: cancelButton
-                   height: 2*root.fontFactor*osSettings.bigFontSize
-                   width: 2*root.fontFactor*osSettings.bigFontSize
-                   text: "\uf057"
-                   onClicked: {
-                       if (textfocus==true){messageSend.destroy()}
-                       else{
-                           bodyField.text="";
-                           messageSend.state="";
-                           permissionDialog.visible=false;
-                           receiverLabel.visible=false;
-                           reply_to_user="";
-                           attachImage("");
-                           attachImageURLs.pop();
-                       }
-                   }
-               }
-               MButton {
-                   id: sendButton
-                   height: 2*root.fontFactor*osSettings.bigFontSize
-                   width: 2*root.fontFactor*osSettings.bigFontSize
-                   text: "\uf1d9"
-                   onClicked: {
-                       var title=titleField.text.replace("\"","\'");
-                       var body=bodyField.getFormattedText(0,bodyField.length);
-                       var dmbody=bodyField.getText(0,bodyField.length);
-                       if (conversation || newsSwipeview.stacktype!=="DirectMessages"){
-                            statusUpdate(title,body,parentId,attachImageURLs)
-                       }else {
-                           if (reply_to_user!=""){dmUpdate(title,dmbody,parentId,reply_to_user)}
-                           else{Helperjs.showMessage(qsTr("Error"),qsTr("No receiver supplied!"),root)}
-                       }
-                        if (conversation==true){
-                            newstab.newstabstatus=root.globaloptions.newsViewType; rootstackView.pop(null)
-                        }
+            }
+            Rectangle{
+                width: 5*mm
+                height: 5*mm
+                visible: imageAttachment.source!=""
+                anchors.bottom: imageAttachment.bottom
+                anchors.right: imageAttachment.right
+                color: "black"
+                opacity: 0.5
+                Text{anchors.centerIn:parent;text: "\uf01e";color: "white"}
+                MouseArea{
+                    anchors.fill:parent;
+                    onClicked:{
+                        rotator.angle+=90;
                     }
-               }
-          }
-          PermissionDialog{id:permissionDialog;x:mm;visible: false}
-          SmileyDialog{id:smileyDialog;x:mm;visible: false}
+                }
+            }
+        }
+
+        Row{
+            id:buttonRow
+            visible:false //(bodyField.length>1)||(attachImageURLs.length>0)
+            spacing: mm
+            height: 2.5*root.fontFactor*osSettings.bigFontSize//12*mm
+            x: 0.5*mm
+
+//            MButton{id:permButton //Permissions not working in Friendica 02/2022
+//                visible: !conversation && (newsSwipeview.stacktype!=="DirectMessages")
+//                height: 2*root.fontFactor*osSettings.bigFontSize
+//                width: 2*root.fontFactor*osSettings.bigFontSize
+//                text: ((contact_allow.length==0)&&(contact_deny.length==0)&&(group_allow.length==0)&&(group_deny.length==0))?"\uf09c":"\uf023"
+//                onClicked: { if (permissionDialog.visible==false){permissionDialog.visible=true} else{permissionDialog.visible=false}}
+//            }
+            MButton {
+                id: attachButton
+                height: 2*root.fontFactor*osSettings.bigFontSize
+                width: 2*root.fontFactor*osSettings.bigFontSize
+                text: "\uf03e"
+                visible:!conversation?(newsSwipeview.stacktype!="DirectMessages"):true
+                onClicked: {
+                    if (attachImageURLs.length>0){//Server currently accepts only one attachment
+                        Helperjs.showMessage( qsTr("Error"),qsTr("Only one attachment supported at the moment.\n Remove other attachment first!"), messageColumn)
+                    }
+                    else{
+                        root.imagePicking=false;
+                        var imagePicker = Qt.createQmlObject('import QtQuick 2.0; import "qrc:/qml/genericqml";'+
+                                                             osSettings.imagePickQml+'{multiple : false;onReady: {attachImageURLs.push(imageUrl);'+
+                                                             'attachImage(imageUrl)}}',root,"imagePicker");
+                        imagePicker.pickImage()
+                    }
+                }
+            }
+
+            MButton{
+                id:smileyButton
+                text: "\uf118"
+                height: 2*root.fontFactor*osSettings.bigFontSize
+                width: 2*root.fontFactor*osSettings.bigFontSize
+                onClicked: {if (smileyDialog.visible==false){smileyDialog.visible=true} else{smileyDialog.visible=false}}
+            }
+
+            MButton{
+                id:hastagButton
+                text: "\uf292"
+                height: 2*root.fontFactor*osSettings.bigFontSize
+                width: 2*root.fontFactor*osSettings.bigFontSize
+                onClicked: {if (tagSelector.visible==false){hashtagmenu()} else{tagSelector.visible=false}}
+            }
+
+            MButton {
+                id: cancelButton
+                height: 2*root.fontFactor*osSettings.bigFontSize
+                width: 2*root.fontFactor*osSettings.bigFontSize
+                text: "\uf057"
+                onClicked: {
+                    if (textfocus==true){messageSend.destroy()}
+                    else{
+                        bodyField.text="";
+                        messageSend.state="";
+                        permissionDialog.visible=false;
+                        receiverLabel.visible=false;
+                        reply_to_user="";
+                        attachImage("");
+                        attachImageURLs.pop();
+                    }
+                }
+            }
+            MButton {
+                id: sendButton
+                height: 2*root.fontFactor*osSettings.bigFontSize
+                width: 2*root.fontFactor*osSettings.bigFontSize
+                text: "\uf1d9"
+                onClicked: {
+                    var title=titleField.text.replace("\"","\'");
+                    var body=bodyField.getFormattedText(0,bodyField.length);
+                    var dmbody=bodyField.getText(0,bodyField.length);
+                    if (conversation || newsSwipeview.stacktype!=="DirectMessages"){
+                        if (parentId!=""){
+                            statusUpdate(title,dmbody,parentId,attachImageURLs)
+                        }else{
+                            statusUpdate(title,body,parentId,attachImageURLs)}
+                    }else {
+                        if (reply_to_user!=""){dmUpdate(title,dmbody,parentId,reply_to_user)}
+                        else{Helperjs.showMessage(qsTr("Error"),qsTr("No receiver supplied!"),root)}
+                    }
+                    if (conversation==true){
+                        newstab.newstabstatus=root.globaloptions.newsViewType; rootstackView.pop(null)
+                    }
+                }
+            }
+        }
+        PermissionDialog{id:permissionDialog;x:mm;visible: false}
+        SmileyDialog{id:smileyDialog;x:mm;visible: false}
+    }
+    Component.onCompleted:{
+        root.replySignal.connect(setParent);
+        root.directmessageSignal.connect(directmessagePrepare);
+        root.uploadSignal.connect(sendUrls);
+        root.sendtextSignal.connect(sendtext);
+        if (textfocus==true){bodyField.forceActiveFocus()}
     }
-        Component.onCompleted:{
-            root.replySignal.connect(setParent);
-            root.directmessageSignal.connect(directmessagePrepare);
-            root.uploadSignal.connect(sendUrls);
-            root.sendtextSignal.connect(sendtext);
-            if (textfocus==true){bodyField.forceActiveFocus()}
-            }
 
-        states: [
-            State {
-                name: "active"
-                PropertyChanges {
-                    target: messageColumn; height: implicitHeight
-                }
-                PropertyChanges {
-                    target: buttonRow; visible:true
-                }
-                PropertyChanges {
-                    target: titleField; visible:(newsSwipeview.stacktype!="DirectMessages")//true
-                }
-                PropertyChanges {
-                    target: receiverLabel; visible:(newsSwipeview.stacktype=="DirectMessages");
-                }
-            },
-            State {
-                name: "conversation"
-                PropertyChanges {
-                    target: messageColumn; height: implicitHeight
-                }
-                PropertyChanges {
-                    target: buttonRow; visible:true
-                }
-                PropertyChanges {
-                    target: titleField; visible:(!conversation&&newsSwipeview.stacktype!="DirectMessages")
-                }
-            },
-
-            State {
-                name: "reply"
-                PropertyChanges {
-                    target: messageColumn; height: implicitHeight
-                }
-                PropertyChanges {
-                    target: buttonRow; visible:true
-                }
-                PropertyChanges {
-                    target: titleField; visible:false
-                }
-                PropertyChanges {
-                    target: bodyField; placeholderText:"";focus:true
-                }
-                PropertyChanges {
-                    target: stackTypeDescription; visible:false
-                }
+    states: [
+        State {
+            name: "active"
+            PropertyChanges {
+                target: messageColumn; height: implicitHeight
             }
-        ]
+            PropertyChanges {
+                target: buttonRow; visible:true
+            }
+            PropertyChanges {
+                target: titleField; visible:(newsSwipeview.stacktype!="DirectMessages")//true
+            }
+            PropertyChanges {
+                target: receiverLabel; visible:(newsSwipeview.stacktype=="DirectMessages");
+            }
+        },
+        State {
+            name: "conversation"
+            PropertyChanges {
+                target: messageColumn; height: implicitHeight
+            }
+            PropertyChanges {
+                target: buttonRow; visible:true
+            }
+            PropertyChanges {
+                target: titleField; visible:(!conversation&&newsSwipeview.stacktype!="DirectMessages")
+            }
+        },
+
+        State {
+            name: "reply"
+            PropertyChanges {
+                target: messageColumn; height: implicitHeight
+            }
+            PropertyChanges {
+                target: buttonRow; visible:true
+            }
+            PropertyChanges {
+                target: titleField; visible:false
+            }
+            PropertyChanges {
+                target: attachButton; visible:false
+            }
+            PropertyChanges {
+                target: bodyField; placeholderText:"";focus:true
+            }
+            PropertyChanges {
+                target: stackTypeDescription; visible:false
+            }
+        }
+    ]
 }
diff --git a/source-linux/qml/newsqml/NewsVideo.qml b/source-linux/qml/newsqml/NewsVideo.qml
index b0399f8..2d68034 100644
--- a/source-linux/qml/newsqml/NewsVideo.qml
+++ b/source-linux/qml/newsqml/NewsVideo.qml
@@ -48,7 +48,7 @@ Rectangle{
 
     MouseArea {anchors.fill:parent;
         onClicked:{
-                rootstackView.push("qrc:/qml/newsqml/NewsVideoLarge.qml",{"source": attachment.url,"mimetype": attachment.mimetype});
+                rootstackView.push("qrc:/qml/newsqml/NewsVideoLarge.qml",{"source": Qt.resolvedUrl(attachment.url),"mimetype": attachment.mimetype});
         }
     }
 }
diff --git a/source-linux/qml/newsqml/NewsVideoLarge.qml b/source-linux/qml/newsqml/NewsVideoLarge.qml
index 0a1b449..93919b9 100644
--- a/source-linux/qml/newsqml/NewsVideoLarge.qml
+++ b/source-linux/qml/newsqml/NewsVideoLarge.qml
@@ -29,8 +29,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import QtMultimedia 5.8
-import QtQuick 2.9
+import QtMultimedia 5.15
+import QtQuick 2.11
 import QtQuick.Controls 2.12
 import "qrc:/qml/genericqml"
 
diff --git a/source-linux/qml/newsqml/Newsitem.qml b/source-linux/qml/newsqml/Newsitem.qml
index 5dfddc3..1fd8f08 100644
--- a/source-linux/qml/newsqml/Newsitem.qml
+++ b/source-linux/qml/newsqml/Newsitem.qml
@@ -129,7 +129,8 @@ Item {
                         font.pointSize: 0.6*osSettings.systemFontSize
                         font.family: "Noto Sans"
                         horizontalAlignment: Label.AlignRight
-                        text: (newsitemobject.in_reply_to_status_id!="null"&&newsitemobject.in_reply_to_status_id!=null)?" \u00B7 "+qsTr("In reply to ")+newsitemobject.reply_user.screen_name:" "
+                        //text: (newsitemobject.in_reply_to_status_id!="null"&&newsitemobject.in_reply_to_status_id!=null)?" \u00B7 "+qsTr("In reply to ")+newsitemobject.reply_user.screen_name:" "
+                        text: (newsitemobject.reply_user!=false&&typeof(newsitemobject.reply_user)!="undefined")?" \u00B7 "+qsTr("In reply to ")+newsitemobject.reply_user.screen_name:" "
                     }
                 }
             }
@@ -330,31 +331,31 @@ Item {
                     }}
             }
 
-//            CheckBox {
-//                id:favoritedCheckbox
-//                visible:((newsitemobject.messagetype==0)||(newsitemobject.messagetype==3))
-//                width: newsitem.width/5
-//                height: parent.height
-//                indicator:Rectangle{
-//                    implicitWidth: newsitem.width/5
-//                    implicitHeight:root.fontFactor*osSettings.bigFontSize
-//                    color:"transparent"
-//                    Text{
-//                        anchors.centerIn: parent
-//                        font.pointSize: osSettings.systemFontSize
-//                        font.family:fontAwesome.name
-//                        color: favoritedCheckbox.checked?Material.primaryTextColor: Material.secondaryTextColor
-//                        text:"\uf005"
-//                    }
-//                }
-//                checked:(newsitemobject.favorited>0)
-//                onClicked:{
-//                    if(favoritedCheckbox.checkState==Qt.Checked){
-//                        Newsjs.favorite(login,true,newsitemobject.id,root); model.newsitemobject.favorited=1}
-//                    else if(favoritedCheckbox.checkState==Qt.Unchecked){
-//                        Newsjs.favorite(login,false,newsitemobject.id,root);model.newsitemobject.favorited=0}
-//                }
-//            }
+            CheckBox {
+                id:favoritedCheckbox
+                visible:((newsitemobject.messagetype==0)||(newsitemobject.messagetype==3))
+                width: newsitem.width/5
+                height: parent.height
+                indicator:Rectangle{
+                    implicitWidth: newsitem.width/5
+                    implicitHeight:root.fontFactor*osSettings.bigFontSize
+                    color:"transparent"
+                    Text{
+                        anchors.centerIn: parent
+                        font.pointSize: osSettings.systemFontSize
+                        font.family:fontAwesome.name
+                        color: favoritedCheckbox.checked?Material.primaryTextColor: Material.secondaryTextColor
+                        text:"\uf005"
+                    }
+                }
+                checked:(newsitemobject.favorited>0)
+                onClicked:{
+                    if(favoritedCheckbox.checkState==Qt.Checked){
+                        Newsjs.favorite(login,true,newsitemobject.id,root); model.newsitemobject.favorited=1}
+                    else if(favoritedCheckbox.checkState==Qt.Unchecked){
+                        Newsjs.favorite(login,false,newsitemobject.id,root);model.newsitemobject.favorited=0}
+                }
+            }
             Rectangle{
                 width: newsitem.width/5
                 height: parent.height
diff --git a/source-linux/qml/photoqml/PhotoTab.qml b/source-linux/qml/photoqml/PhotoTab.qml
index 396fdf6..a3f89a9 100644
--- a/source-linux/qml/photoqml/PhotoTab.qml
+++ b/source-linux/qml/photoqml/PhotoTab.qml
@@ -58,16 +58,16 @@ StackView{
                         if(albums.indexOf(fotorectangle.newimages[i].album)==-1){
                             filesystem.Directory=root.login.imagestore+"/albums";
                             filesystem.makeDir(fotorectangle.newimages[i].album)}
-
-                        //ownimagelist.push(root.login.server+"/api/friendica/photo?scale='0'&photo_id="+fotorectangle.newimages[i].id);
+                        ownimagelist.push(root.login.server+"/api/friendica/photo?photo_id="+fotorectangle.newimages[i].id);
                     }
-                    Imagejs.dataRequest(login,fotorectangle.newimages[0],db,xhr,fotorectangle);
+                    //Imagejs.dataRequest(login,fotorectangle.newimages[0],db,xhr,fotorectangle);
                 })
-                //            xhr.setLogin(login.username+":"+Qt.atob(login.password));
-                //            xhr.setImagedir(login.imagestore);
-                //            xhr.setFilelist(ownimagelist);
-                //            xhr.setDownloadtype("picturelist");
-                //            xhr.getlist();
+                xhr.setLogin(login.username+":"+Qt.atob(login.password));
+                xhr.setImagedir(login.imagestore);
+                print("ownimagelist "+JSON.stringify(ownimagelist))
+                xhr.setFilelist(ownimagelist);
+                xhr.setDownloadtype("picturelist");
+                xhr.getlist();
                 newImagesProgress.visible=true
             }
         }
@@ -78,7 +78,7 @@ StackView{
                 fotorectangle.newimages=[];fotorectangle.currentimageno=0
             }else{
                 // download next image
-                Imagejs.dataRequest(login,fotorectangle.newimages[currentimageno],db,xhr,fotorectangle)
+                //Imagejs.dataRequest(login,fotorectangle.newimages[currentimageno],db,xhr,fotorectangle)
             }
         }
 
@@ -95,8 +95,8 @@ StackView{
             }
             function onError(data,url,api,code){
                 if(data=="picturelist"){
-                    var requestid=url.substring(url.lastIndexOf("=")+1);
-                    Imagejs.dataRequest(login,requestid,db,xhr,fotorectangle);
+//                    var requestid=api.substring(api.lastIndexOf("=")+1);
+//                    Imagejs.dataRequest(login,requestid,db,xhr,fotorectangle);
                     fotorectangle.currentimageno=fotorectangle.currentimageno+1
                 } else if (data=="picture"){
                     Helperjs.deleteData(root.db,"imageData",root.login.username,function(){