diff --git a/source-android/android/AndroidManifest.xml b/source-android/android/AndroidManifest.xml
index d71d476..8b1c467 100644
--- a/source-android/android/AndroidManifest.xml
+++ b/source-android/android/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<manifest package="org.qtproject.friendiqa" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.5" android:versionCode="13" android:installLocation="auto">
+<manifest package="org.qtproject.friendiqa" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.5.1" android:versionCode="14" android:installLocation="auto">
     <application android:hardwareAccelerated="true" android:vmSafeMode="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Friendiqa" android:icon="@drawable/friendiqa" android:logo="@drawable/friendiqa" android:theme="@android:style/Theme.Holo.Light">
-        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="androidnative.friendiqa.FriendiqaActivity" android:label="Friendiqa" android:screenOrientation="unspecified" android:launchMode="singleInstance" android:taskAffinity="">
+        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="androidnative.friendiqa.FriendiqaActivity" android:label="Friendiqa" android:screenOrientation="unspecified" android:launchMode="singleTask" android:taskAffinity="">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -50,6 +50,7 @@
             <!-- Background running -->
         </activity>
 
+	
         <service android:name="androidnative.friendiqa.FriendiqaService" android:permission="android.permission.BIND_JOB_SERVICE">
             <meta-data android:name="android.app.background_running" android:value="true"/>
         </service>
@@ -61,31 +62,31 @@
             <meta-data android:name="android.app.repository" android:value="default"/>
             <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
             <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
-            <!-- Deploy Qt libs as part of package -->
+
             <meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
             <meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
             <meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/>
-            <!-- Run with local libs -->
+ 
             <meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/>
             <meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
             <meta-data android:name="android.app.load_local_libs" android:value="-- %%INSERT_LOCAL_LIBS%% --"/>
             <meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
             <meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
-            <!--  Messages maps -->
+ 
             <meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
             <meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
             <meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
-            <!--  Messages maps -->
+
             <meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/splash"/>
         </service>
 
         <service android:process=":qt" android:name="androidnative.friendiqa.FriendiqaStopService" android:permission="android.permission.BIND_JOB_SERVICE" android:exported="true">
             <meta-data android:name="android.app.background_running" android:value="true"/>
         </service>
-
+	
 
     </application>
-    <uses-sdk android:minSdkVersion="18" android:targetSdkVersion="26"/>
+    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/>
     <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
 
     <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
diff --git a/source-android/android/build.gradle b/source-android/android/build.gradle
index f4f2592..ef7e187 100644
--- a/source-android/android/build.gradle
+++ b/source-android/android/build.gradle
@@ -11,6 +11,9 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
     }
 }
 
@@ -23,11 +26,11 @@ dependencies {
 //apply plugin: 'android-library'
 
 dependencies {
-    compile 'com.android.support:support-v4:25.3.1'
+    compile 'com.android.support:support-v4:25.4.0'
 }
 
 dependencies {
-    compile 'com.android.support:support-compat:25.3.1'
+    compile 'com.android.support:support-compat:25.4.0'
 }
 
 android {
diff --git a/source-android/android/build.gradle.backup b/source-android/android/build.gradle.backup
new file mode 100644
index 0000000..f4f2592
--- /dev/null
+++ b/source-android/android/build.gradle.backup
@@ -0,0 +1,69 @@
+buildscript {
+    repositories {
+        jcenter()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.1.0'
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
+
+apply plugin: 'com.android.application'
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+}
+
+//apply plugin: 'android-library'
+
+dependencies {
+    compile 'com.android.support:support-v4:25.3.1'
+}
+
+dependencies {
+    compile 'com.android.support:support-compat:25.3.1'
+}
+
+android {
+    /*******************************************************
+     * The following variables:
+     * - androidBuildToolsVersion,
+     * - androidCompileSdkVersion
+     * - qt5AndroidDir - holds the path to qt android files
+     *                   needed to build any Qt application
+     *                   on Android.
+     *
+     * are defined in gradle.properties file. This file is
+     * updated by QtCreator and androiddeployqt tools.
+     * Changing them manually might break the compilation!
+     *******************************************************/
+
+    compileSdkVersion androidCompileSdkVersion.toInteger()
+
+    buildToolsVersion androidBuildToolsVersion
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = [qt5AndroidDir + '/src', 'src', 'java']
+            aidl.srcDirs = [qt5AndroidDir + '/src', 'src', 'aidl']
+            res.srcDirs = [qt5AndroidDir + '/res', 'res']
+            resources.srcDirs = ['src']
+            renderscript.srcDirs = ['src']
+            assets.srcDirs = ['assets']
+            jniLibs.srcDirs = ['libs']
+       }
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+}
+    apply from: "androidnative.gradle"
+    setAndroidNativePath("/../androidnative.pri");
diff --git a/source-android/android/libcrypto_1_1.so b/source-android/android/libcrypto_1_1.so
new file mode 100755
index 0000000..8ddd6e3
Binary files /dev/null and b/source-android/android/libcrypto_1_1.so differ
diff --git a/source-android/android/libssl_1_1.so b/source-android/android/libssl_1_1.so
new file mode 100755
index 0000000..dc484b4
Binary files /dev/null and b/source-android/android/libssl_1_1.so differ
diff --git a/source-android/androidnative.pri/java/src/androidnative/AndroidNativeActivity.java b/source-android/androidnative.pri/java/src/androidnative/AndroidNativeActivity.java
index 5832b90..b9a4ffd 100644
--- a/source-android/androidnative.pri/java/src/androidnative/AndroidNativeActivity.java
+++ b/source-android/androidnative.pri/java/src/androidnative/AndroidNativeActivity.java
@@ -43,6 +43,7 @@ public class AndroidNativeActivity extends org.qtproject.qt5.android.bindings.Qt
         if((getIntent().getFlags() == (Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY)) || (getIntent().getFlags() == Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) || (getIntent().getFlags() == Intent.FLAG_ACTIVITY_NEW_TASK) || (getIntent().getFlags() == Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED) || (getIntent().getFlags() == (Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED))) {
             SystemDispatcher.onActivityResume();
 	} else {
+
             Intent data = getIntent();
 	    if ((data!=null) && (data.getType() != null) && !(data.getBooleanExtra("used",false))){
 	       String type = data.getType();
diff --git a/source-android/androidnative.pri/java/src/androidnative/ImagePicker.java b/source-android/androidnative.pri/java/src/androidnative/ImagePicker.java
index 0b4737d..5fd8c04 100644
--- a/source-android/androidnative.pri/java/src/androidnative/ImagePicker.java
+++ b/source-android/androidnative.pri/java/src/androidnative/ImagePicker.java
@@ -62,6 +62,7 @@ public class ImagePicker {
 
         // >= API 18
         activity.startActivityForResult(intent, PICK_IMAGE_ACTION);
+
     }
 
     static void takePhoto(Map message) {
diff --git a/source-android/androidnative.pri/java/src/androidnative/Util.java b/source-android/androidnative.pri/java/src/androidnative/Util.java
index 500da26..8aefa9e 100644
--- a/source-android/androidnative.pri/java/src/androidnative/Util.java
+++ b/source-android/androidnative.pri/java/src/androidnative/Util.java
@@ -139,6 +139,9 @@ public class Util {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
             return;
         }
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.O) {
+            return;
+        }
         //Log.d(TAG,"Friendiqa schedule Androidnative service");
         final Integer value = (Integer) message.get("value");
         //final Activity activity = QtNative.activity();
diff --git a/source-android/application.qrc b/source-android/application.qrc
deleted file mode 100644
index 6f2b8d7..0000000
--- a/source-android/application.qrc
+++ /dev/null
@@ -1,235 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>qtquickcontrols2.conf</file>
-        <file>qml/friendiqa.qml</file>
-        <file>qml/newsqml/NewsTab.qml</file>
-        <file>qml/newsqml/Newsitem.qml</file>
-        <file>qml/newsqml/MessageSend.qml</file>
-        <file>qml/newsqml/Conversation.qml</file>
-        <file>qml/newsqml/FriendicaActivities.qml</file>
-        <file>qml/contactqml/FriendsTab.qml</file>
-        <file>qml/contactqml/GroupComponent.qml</file>
-        <file>qml/contactqml/ContactComponent.qml</file>
-        <file>qml/contactqml/ContactDetailsComponent.qml</file>
-        <file>qml/contactqml/Contactlist.qml</file>
-        <file>qml/genericqml/BlueButton.qml</file>
-        <file>qml/photoqml/PhotoComponent.qml</file>
-        <file>qml/photoqml/PhotogroupComponent.qml</file>
-        <file>qml/photoqml/PhotoTab.qml</file>
-        <file>qml/configqml/InfoBox.qml</file>
-        <file>qml/configqml/ConfigPage.qml</file>
-        <file>js/layout.js</file>
-        <file>js/photoworker.js</file>
-        <file>js/service.js</file>
-        <file>js/news.js</file>
-        <file>js/newsworker.js</file>
-        <file>js/helper.js</file>
-        <file>images/defaultcontact.jpg</file>
-        <file>images/fontawesome-webfont.ttf</file>
-        <file>images/folder-blue.png</file>
-        <file>qml/configqml/OSSettingsAndroid.qml</file>
-        <file>qml/genericqml/MButton.qml</file>
-        <file>qml/configqml/OSSettingsLinux.qml</file>
-        <file>qml/newsqml/SmileyDialog.qml</file>
-        <file>js/smiley.js</file>
-        <file>images/smileys/animals/bee.gif</file>
-        <file>images/smileys/animals/bigspider.gif</file>
-        <file>images/smileys/animals/bunny.gif</file>
-        <file>images/smileys/animals/bunnyflowers.gif</file>
-        <file>images/smileys/animals/cat.gif</file>
-        <file>images/smileys/animals/chick.gif</file>
-        <file>images/smileys/animals/cow.gif</file>
-        <file>images/smileys/animals/crab.gif</file>
-        <file>images/smileys/animals/dog.gif</file>
-        <file>images/smileys/animals/dolphin.gif</file>
-        <file>images/smileys/animals/dragonfly.gif</file>
-        <file>images/smileys/animals/elephant.gif</file>
-        <file>images/smileys/animals/fish.gif</file>
-        <file>images/smileys/animals/frog.gif</file>
-        <file>images/smileys/animals/giraffe.gif</file>
-        <file>images/smileys/animals/hamster.gif</file>
-        <file>images/smileys/animals/horse.gif</file>
-        <file>images/smileys/animals/ladybird.gif</file>
-        <file>images/smileys/animals/monkey.gif</file>
-        <file>images/smileys/animals/parrot.gif</file>
-        <file>images/smileys/animals/pig.gif</file>
-        <file>images/smileys/animals/sheep.gif</file>
-        <file>images/smileys/animals/snail.gif</file>
-        <file>images/smileys/animals/tux.gif</file>
-        <file>images/smileys/babies/baby.gif</file>
-        <file>images/smileys/babies/babycot.gif</file>
-        <file>images/smileys/babies/pregnant.gif</file>
-        <file>images/smileys/babies/stork.gif</file>
-        <file>images/smileys/confused/confused.gif</file>
-        <file>images/smileys/confused/dazed.gif</file>
-        <file>images/smileys/confused/shrug.gif</file>
-        <file>images/smileys/confused/stupid.gif</file>
-        <file>images/smileys/cool/affro.gif</file>
-        <file>images/smileys/cool/cool.gif</file>
-        <file>images/smileys/devilangel/angel.gif</file>
-        <file>images/smileys/devilangel/blondedevil.gif</file>
-        <file>images/smileys/devilangel/catdevil.gif</file>
-        <file>images/smileys/devilangel/cherub.gif</file>
-        <file>images/smileys/devilangel/daseesaw.gif</file>
-        <file>images/smileys/devilangel/devil.gif</file>
-        <file>images/smileys/devilangel/graveside.gif</file>
-        <file>images/smileys/devilangel/saint.gif</file>
-        <file>images/smileys/devilangel/turnevil.gif</file>
-        <file>images/smileys/disgust/fartblush.gif</file>
-        <file>images/smileys/disgust/fartinbed.gif</file>
-        <file>images/smileys/disgust/toilet.gif</file>
-        <file>images/smileys/disgust/vomit.gif</file>
-        <file>images/smileys/drink/tea.gif</file>
-        <file>images/smileys/drool/drool.gif</file>
-        <file>images/smileys/fantasy/alienmonster.gif</file>
-        <file>images/smileys/fantasy/barbarian.gif</file>
-        <file>images/smileys/fantasy/dinosaur.gif</file>
-        <file>images/smileys/fantasy/dragon.gif</file>
-        <file>images/smileys/fantasy/dragonwhelp.gif</file>
-        <file>images/smileys/fantasy/ghost.gif</file>
-        <file>images/smileys/fantasy/mummy.gif</file>
-        <file>images/smileys/fight/2guns.gif</file>
-        <file>images/smileys/fight/acid.gif</file>
-        <file>images/smileys/fight/alienfight.gif</file>
-        <file>images/smileys/fight/alpha.png</file>
-        <file>images/smileys/fight/army.gif</file>
-        <file>images/smileys/fight/arrowhead.gif</file>
-        <file>images/smileys/fight/bfg.gif</file>
-        <file>images/smileys/fight/bowman.gif</file>
-        <file>images/smileys/fight/chainsaw.gif</file>
-        <file>images/smileys/fight/crossbow.gif</file>
-        <file>images/smileys/fight/crusader.gif</file>
-        <file>images/smileys/fight/dead.gif</file>
-        <file>images/smileys/fight/gangs.gif</file>
-        <file>images/smileys/fight/hammersplat.gif</file>
-        <file>images/smileys/fight/lasergun.gif</file>
-        <file>images/smileys/fight/machinegun.gif</file>
-        <file>images/smileys/fight/marine.gif</file>
-        <file>images/smileys/fight/sabre.gif</file>
-        <file>images/smileys/fight/samurai.gif</file>
-        <file>images/smileys/fight/tank.gif</file>
-        <file>images/smileys/fight/viking.gif</file>
-        <file>images/smileys/food/apple.gif</file>
-        <file>images/smileys/food/banana.gif</file>
-        <file>images/smileys/food/birthdaycake.gif</file>
-        <file>images/smileys/food/broccoli.gif</file>
-        <file>images/smileys/food/cake.gif</file>
-        <file>images/smileys/food/carrot.gif</file>
-        <file>images/smileys/food/cooking.gif</file>
-        <file>images/smileys/food/fryegg.gif</file>
-        <file>images/smileys/food/popcorn.gif</file>
-        <file>images/smileys/food/tomato.gif</file>
-        <file>images/smileys/happy/cloud9.gif</file>
-        <file>images/smileys/happy/tearsofjoy.gif</file>
-        <file>images/smileys/laugh/hahaha.gif</file>
-        <file>images/smileys/laugh/loltv.gif</file>
-        <file>images/smileys/laugh/rofl.gif</file>
-        <file>images/smileys/love/iloveyou.gif</file>
-        <file>images/smileys/love/inlove.gif</file>
-        <file>images/smileys/love/love.gif</file>
-        <file>images/smileys/love/lovebear.gif</file>
-        <file>images/smileys/love/lovebed.gif</file>
-        <file>images/smileys/love/loveheart.gif</file>
-        <file>images/smileys/music/dj.gif</file>
-        <file>images/smileys/music/drums.gif</file>
-        <file>images/smileys/music/elvis.gif</file>
-        <file>images/smileys/music/guitar.gif</file>
-        <file>images/smileys/music/trumpet.gif</file>
-        <file>images/smileys/music/violin.gif</file>
-        <file>images/smileys/oldcore/beard.png</file>
-        <file>images/smileys/oldcore/headbang.gif</file>
-        <file>images/smileys/oldcore/laughing.gif</file>
-        <file>images/smileys/oldcore/shaka.gif</file>
-        <file>images/smileys/oldcore/surprised.gif</file>
-        <file>images/smileys/oldcore/whitebeard.png</file>
-        <file>images/smileys/respect/bow.gif</file>
-        <file>images/smileys/respect/bravo.gif</file>
-        <file>images/smileys/respect/hailking.gif</file>
-        <file>images/smileys/respect/number1.gif</file>
-        <file>images/smileys/sad/crying.png</file>
-        <file>images/smileys/sad/prisoner.gif</file>
-        <file>images/smileys/sad/sigh.gif</file>
-        <file>images/smileys/smoking/smoking.gif</file>
-        <file>images/smileys/sport/archery.gif</file>
-        <file>images/smileys/sport/basketball.gif</file>
-        <file>images/smileys/sport/bowling.gif</file>
-        <file>images/smileys/sport/cycling.gif</file>
-        <file>images/smileys/sport/darts.gif</file>
-        <file>images/smileys/sport/fencing.gif</file>
-        <file>images/smileys/sport/football.gif</file>
-        <file>images/smileys/sport/golf.gif</file>
-        <file>images/smileys/sport/horseriding.gif</file>
-        <file>images/smileys/sport/juggling.gif</file>
-        <file>images/smileys/sport/skipping.gif</file>
-        <file>images/smileys/sport/snooker.gif</file>
-        <file>images/smileys/sport/surfing.gif</file>
-        <file>images/smileys/sport/tennis.gif</file>
-        <file>images/smileys/tired/countsheep.gif</file>
-        <file>images/smileys/tired/hammock.gif</file>
-        <file>images/smileys/tired/pillow.gif</file>
-        <file>images/smileys/tired/yawn.gif</file>
-        <file>images/smileys/core/beer_mug.gif</file>
-        <file>images/smileys/core/coffee.gif</file>
-        <file>images/smileys/core/dislike.gif</file>
-        <file>images/smileys/core/friendica-16.png</file>
-        <file>images/smileys/core/like.gif</file>
-        <file>images/smileys/core/rm-16.png</file>
-        <file>images/smileys/core/smiley-bangheaddesk.gif</file>
-        <file>images/smileys/core/smiley-brokenheart.gif</file>
-        <file>images/smileys/core/smiley-cool.gif</file>
-        <file>images/smileys/core/smiley-cry.gif</file>
-        <file>images/smileys/core/smiley-embarassed.gif</file>
-        <file>images/smileys/core/smiley-facepalm.gif</file>
-        <file>images/smileys/core/smiley-foot-in-mouth.gif</file>
-        <file>images/smileys/core/smiley-heart.gif</file>
-        <file>images/smileys/core/smiley-kiss.gif</file>
-        <file>images/smileys/core/smiley-laughing.gif</file>
-        <file>images/smileys/core/smiley-Oo.gif</file>
-        <file>images/smileys/core/smiley-smile.gif</file>
-        <file>images/smileys/core/smiley-surprised.gif</file>
-        <file>images/smileys/core/smiley-thumbsup.gif</file>
-        <file>images/smileys/core/smiley-tongue-out.gif</file>
-        <file>images/smileys/core/smiley-undecided.gif</file>
-        <file>images/smileys/core/smiley-wink.gif</file>
-        <file>images/smileys/core/smiley-frown.gif</file>
-        <file>images/smileys/adult/bong.gif</file>
-        <file>images/smileys/adult/drunk.gif</file>
-        <file>images/smileys/adult/finger.gif</file>
-        <file>images/smileys/adult/sperm.gif</file>
-        <file>images/smileys/adult/tits.gif</file>
-        <file>common/filesystem.cpp</file>
-        <file>common/filesystem.h</file>
-        <file>common/friendiqa.cpp</file>
-        <file>common/uploadableimage.cpp</file>
-        <file>common/uploadableimage.h</file>
-        <file>common/xhr.cpp</file>
-        <file>common/xhr.h</file>
-        <file>qml/calendarqml/CalendarTab.qml</file>
-        <file>qml/calendarqml/CalendarDay.qml</file>
-        <file>qml/calendarqml/EventList.qml</file>
-        <file>translations/friendiqa-de.qm</file>
-        <file>translations/friendiqa-de.ts</file>
-        <file>translations/friendiqa-es.qm</file>
-        <file>translations/friendiqa-es.ts</file>
-        <file>qml/photoqml/ImageUploadDialog.qml</file>
-        <file>qml/genericqml/PermissionDialog.qml</file>
-        <file>images/addImage.png</file>
-        <file>qml/genericqml/ImagePicker.qml</file>
-        <file>qml/genericqml/ImagePickerLinux.qml</file>
-        <file>js/image.js</file>
-        <file>qml/contactqml/ProfileComponent.qml</file>
-        <file>translations/friendiqa-it.ts</file>
-        <file>qml/genericqml/Search.qml</file>
-        <file>qml/newsqml/Hashtag.qml</file>
-        <file>qml/genericqml/IntentReceiver.qml</file>
-        <file>qml/newsqml/NewsImage.qml</file>
-        <file>qml/newsqml/NewsVideo.qml</file>
-        <file>qml/newsqml/ContactPage.qml</file>
-        <file>qml/newsqml/NewsLink.qml</file>
-        <file>qml/configqml/RegisterPage.qml</file>
-        <file>qml/configqml/AccountPage.qml</file>
-        <file>qml/newsqml/NewsStack.qml</file>
-        <file>qml/configqml/SyncConfig.qml</file>
-        <file>qml/configqml/SyncComponent.qml</file>
-    </qresource>
-</RCC>
diff --git a/source-android/application.qrc b/source-android/application.qrc
new file mode 120000
index 0000000..4607047
--- /dev/null
+++ b/source-android/application.qrc
@@ -0,0 +1 @@
+../source-linux/application.qrc
\ No newline at end of file
diff --git a/source-android/common/alarm.h b/source-android/common/alarm.h
deleted file mode 100644
index bd66f04..0000000
--- a/source-android/common/alarm.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef ALARM_H
-#define ALARM_H
-
-#include <QObject>
-
-class ALARM : public QObject
-{
-    Q_OBJECT
-    //Q_PROPERTY(int alarmtime READ alarmtime WRITE setAlarm NOTIFY alarmChanged)
-public:
-    static ALARM *instance();
-
-    explicit ALARM(QObject *parent = 0);
-  
-    //int alarmtime() const;
-
-signals:
-
-    void alarmChanged(QString url);
-
-public slots:
-    void setAlarm(int time);
-    void notify(QString title, QString text, int id);
-
-private:
-    int m_time;
-};
-
-#endif // UPDATENEWS_H
diff --git a/source-android/common/alarm.h b/source-android/common/alarm.h
new file mode 120000
index 0000000..b5e49ca
--- /dev/null
+++ b/source-android/common/alarm.h
@@ -0,0 +1 @@
+../../source-linux/common/alarm.h
\ No newline at end of file
diff --git a/source-android/common/alarmandroid.cpp b/source-android/common/alarmandroid.cpp
deleted file mode 100644
index b1fcbfd..0000000
--- a/source-android/common/alarmandroid.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#include "alarm.h"
-#include <QtCore/QDebug>
-#include "AndroidNative/systemdispatcher.h"
-
-ALARM *ALARM::instance()
-{
-    static ALARM alarm;
-    return &alarm;
-}
-
-ALARM::ALARM(QObject *parent) : QObject(parent){}
-
-void ALARM::setAlarm(int interval)
-{
-    QVariantMap message;
-    message["value"] = interval;
-    AndroidNative::SystemDispatcher::instance()->loadClass("androidnative.Util");
-    AndroidNative::SystemDispatcher::instance()->dispatch("androidnative.Util.setSchedule", message);
-    AndroidNative::SystemDispatcher::instance()->dispatch("androidnative.Util.stopService", message);
-}
-
-void ALARM::notify(QString title, QString text, int id)
-{
-    //qDebug() << "notify "<< title << text;
-    QVariantMap message;
-    message["title"] = title;
-    message["message"] =  text;
-    message["id"] =  id;
-    AndroidNative::SystemDispatcher::instance()->loadClass("androidnative.Util");
-    AndroidNative::SystemDispatcher::instance()->dispatch("androidnative.Util.setNotification", message);
-}
diff --git a/source-android/common/alarmandroid.cpp b/source-android/common/alarmandroid.cpp
new file mode 120000
index 0000000..adb6cb0
--- /dev/null
+++ b/source-android/common/alarmandroid.cpp
@@ -0,0 +1 @@
+../../source-linux/common/alarmandroid.cpp
\ No newline at end of file
diff --git a/source-android/common/alarmlinux.cpp b/source-android/common/alarmlinux.cpp
deleted file mode 100644
index c9b0a57..0000000
--- a/source-android/common/alarmlinux.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-//#include <QtAndroidExtras/QAndroidJniObject>
-//#include <QtAndroidExtras/QAndroidJniEnvironment>
-#include "alarm.h"
-#include <QtCore/QDebug>
-#include <QtDBus/QtDBus>
-//#include "AndroidNative/systemdispatcher.h"
-
-ALARM *ALARM::instance()
-{
-    static ALARM alarm;
-    return &alarm;
-}
-
-ALARM::ALARM(QObject *parent) : QObject(parent){}
-
-void ALARM::setAlarm(int interval)
-{
-    qDebug() << interval;
-    QVariantMap message;
-    message["value"] = interval;
-   // AndroidNative::SystemDispatcher::instance()->loadClass("androidnative.Util");
-   // AndroidNative::SystemDispatcher::instance()->dispatch("androidnative.Util.setSchedule", message);
-    //AndroidNative::SystemDispatcher::instance()->dispatch("androidnative.Util.stopService", message);
-}
-
-void ALARM::notify(QString title, QString text, int id)
-{
-    qDebug() << title << text;
-    QVariantMap message;
-    message["title"] = title;
-    message["message"] =  text;
-    QDBusConnection bus = QDBusConnection::sessionBus();
-    QDBusInterface dbus_iface("org.freedesktop.Notifications", "/org/freedesktop/Notifications",
-                              "org.freedesktop.Notifications", bus);
-    QString appname="Friendiqa";
-    uint v=12321;
-    if (dbus_iface.isValid()){
-
-        dbus_iface.call("Notify",appname,v,"",title,text,"","",5000);
-    }
-   // AndroidNative::SystemDispatcher::instance()->dispatch("Notifier.notify", message);
-}
diff --git a/source-android/common/alarmlinux.cpp b/source-android/common/alarmlinux.cpp
new file mode 120000
index 0000000..af9de81
--- /dev/null
+++ b/source-android/common/alarmlinux.cpp
@@ -0,0 +1 @@
+../../source-linux/common/alarmlinux.cpp
\ No newline at end of file
diff --git a/source-android/common/filesystem.cpp b/source-android/common/filesystem.cpp
deleted file mode 100644
index c1668e4..0000000
--- a/source-android/common/filesystem.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#include "filesystem.h"
-
-FILESYSTEM *FILESYSTEM::instance()
-{
-    static FILESYSTEM filesystem;
-    return &filesystem;
-}
-
-FILESYSTEM::FILESYSTEM(QObject *parent) : QObject(parent){}
-
-void FILESYSTEM::setDirectory(QString Directory)
-{
-   if (Directory!=m_Directory) {
-       m_Directory = Directory;
-       emit directoryChanged();
-   }
-}
-
-QString FILESYSTEM::Directory() const
-{
-    return m_Directory;
-}
-
-QString FILESYSTEM::homePath() const
-{
-    QDir dir(m_Directory);
-    QString homeDir=dir.homePath();
-    //qDebug(homeDir);
-    return homeDir;
-}
-
-//QString FILESYSTEM::cameraPath() const
-//{
-//QAndroidJniObject object = QAndroidJniObject::getStaticObjectField<jstring>("android.os.Environment", "DIRECTORY_DCIM");
-//QAndroidJniObject dcim =QAndroidJniObject::callStaticObjectMethod("android.os.Environment","getExternalStoragePublicDirectory", "(Ljava/lang/String;)Ljava/io/File;", object.object<jobject>());
-// return dcim.toString();
-//}
-
-
-//bool FILESYSTEM::direxist(QString Directory) const
-//{QDir dir(Directory);
-// return dir.exists();
-//}
-
-bool FILESYSTEM::fileexist(QString name)
-{ return QFile::exists(name);
-}
-
-void FILESYSTEM::makeDir(QString name)
-{
-    QDir dir(m_Directory);
-    if (dir.mkdir(name)){
-        emit success(name);
-    }
-    else {emit error(name,1);}
-}
-
-void FILESYSTEM::rmDir()
-{
-    QDir dir(m_Directory);
-    //qDebug()<<m_Directory;
-   if (dir.removeRecursively()){
-    emit success(m_Directory);
-    }
-    else {emit error(m_Directory,1);}
-}
-
-void FILESYSTEM::rmFile(QString name)
-{
-    QDir dir(m_Directory);
-    //qDebug()<<m_Directory;
-    //qDebug(name);
-    if(dir.remove(name)){
-    emit success(name);
-    }
-    else {emit error(name,1);}
-}
-QFileInfoList FILESYSTEM::fileList()
-{
-    QDir dir(m_Directory);
-    QStringList filters;
-    filters << "*.png" <<"*.PNG" << "*.jpg" << "*.JPG" << "*.JPEG";
-    dir.setNameFilters(filters);
-    dir.setSorting(QDir::Time | QDir::Reversed);
-    //QStringList m_Filelist=dir.entryInfoList();
-    //qDebug() << "filelist " << m_Filelist;
-    return dir.entryInfoList();
-}
diff --git a/source-android/common/filesystem.cpp b/source-android/common/filesystem.cpp
new file mode 120000
index 0000000..94a7237
--- /dev/null
+++ b/source-android/common/filesystem.cpp
@@ -0,0 +1 @@
+../../source-linux/common/filesystem.cpp
\ No newline at end of file
diff --git a/source-android/common/filesystem.h b/source-android/common/filesystem.h
deleted file mode 100644
index c8baae8..0000000
--- a/source-android/common/filesystem.h
+++ /dev/null
@@ -1,81 +0,0 @@
-//  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef FILESYSTEM_H
-#define FILESYSTEM_H
-
-#include <QDir>
-#include <QObject>
-//#include <QtAndroidExtras>
-//#include <QAndroidActivityResultReceiver>
-
-class FILESYSTEM : public QObject//, public QAndroidActivityResultReceiver
-{
-    Q_OBJECT
-    Q_PROPERTY(QString Directory READ Directory WRITE setDirectory NOTIFY directoryChanged)
-    //Q_PROPERTY(bool direxist READ direxist)
-    Q_PROPERTY(QString homePath READ homePath)
-    //Q_PROPERTY(QString cameraPath READ cameraPath)
-
-
-public:
-    static FILESYSTEM *instance();
-    explicit FILESYSTEM(QObject *parent = 0);
-    void setDirectory(QString Directory);
-    QString Directory() const;
-    QFileInfoList fileList();
-    //bool direxist(QString Directory);
-    QString homePath() const;
-    //QString cameraPath() const;
-   // virtual void handleActivityResult(int receiverRequestCode, int resultCode, const QAndroidJniObject &data);
-
-signals:
-    //void imageselected(QString);
-    void directoryChanged();
-    //void fileListContent(QList data);
-    void success(QString data);
-    void error(QString data, int code);
-
-public slots:
-    bool fileexist(QString name);
-    void makeDir(QString name);
-    void rmDir();
-    void rmFile(QString name);
-    //void searchImage();
-    //void fileList();
-
-private:
-    QString m_Directory;
-    QString homeDir;
-    //QList m_Filelist;
-};
-
-#endif // FILSYSTEM_H
diff --git a/source-android/common/filesystem.h b/source-android/common/filesystem.h
new file mode 120000
index 0000000..0ee6500
--- /dev/null
+++ b/source-android/common/filesystem.h
@@ -0,0 +1 @@
+../../source-linux/common/filesystem.h
\ No newline at end of file
diff --git a/source-android/common/friendiqa.cpp b/source-android/common/friendiqa.cpp
index 36077d2..e87b78a 100644
--- a/source-android/common/friendiqa.cpp
+++ b/source-android/common/friendiqa.cpp
@@ -44,7 +44,7 @@
 
 
 #ifdef Q_OS_ANDROID
-#include <QtAndroidExtras/QAndroidJniObject> 
+#include <QtAndroidExtras/QAndroidJniObject>
 #include <QtAndroidExtras/QAndroidJniEnvironment>
 JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void*) {
     Q_UNUSED(vm);
@@ -52,13 +52,13 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void*) {
 
  AndroidNative::SystemDispatcher::registerNatives();
  return JNI_VERSION_1_6;
- } 
+ }
 #endif
 
 
 int main(int argc, char *argv[]) {
-    //qDebug()<< "argv Friendiqa"<< argv[0] <<" argv2" <<argv[1];
-    if (qstrcmp(argv[1],"-service")==0){
+    //qDebug()<< "argv Friendiqa"<< argv[0]; //<<" argv2" <<argv[1];
+    if ((argc>1) && (qstrcmp(argv[1],"-service")==0)){
         //qDebug()<<"FriendiqaMain Service";
         QAndroidService app(argc, argv);
         UPDATENEWS* updatenews= UPDATENEWS::instance();
@@ -71,6 +71,7 @@ int main(int argc, char *argv[]) {
     else{
     QApplication app(argc, argv);
     QQuickView view;
+    qDebug()<<"FriendiqaMain started";
     QTranslator qtTranslator;
     qtTranslator.load("friendiqa-" + QLocale::system().name(),":/translations");
     app.installTranslator(&qtTranslator);
@@ -86,8 +87,10 @@ int main(int argc, char *argv[]) {
     UPDATENEWS* updatenews = UPDATENEWS::instance();
     view.rootContext()->setContextProperty("updatenews", updatenews);
     view.setSource(QUrl("qrc:/qml/friendiqa.qml"));
+    //QtWebEngine::initialize();
     view.show();
     view.connect(view.rootContext()->engine(), SIGNAL(quit()), &app, SLOT(quit()));
+
     return app.exec();
     }
 }
diff --git a/source-android/common/remoteauthasyncimageprovider.cpp b/source-android/common/remoteauthasyncimageprovider.cpp
deleted file mode 100644
index 66a8b03..0000000
--- a/source-android/common/remoteauthasyncimageprovider.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-//  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#include "remoteauthasyncimageprovider.h"
-#include <QQuickAsyncImageProvider>
-#include <QImage>
-
- AsyncImageResponse::AsyncImageResponse(QNetworkRequest req, QSize reqSize)
- {
-     m_reply = m_imageLoader.get(req);
-     m_requestedSize = reqSize;
-     connect(m_reply, &QNetworkReply::finished, this, &AsyncImageResponse::onResponseFinished);
-}
-
-
- void AsyncImageResponse::onResponseFinished()
- {
-     QByteArray myImageData = m_reply->readAll();
-     m_resultImage = QImage::fromData(myImageData);
-     if (m_requestedSize.isValid())
-     {
-         m_resultImage = m_resultImage.scaled(m_requestedSize);
-     }
-     emit finished();
- }
-
-
- QQuickTextureFactory *AsyncImageResponse::textureFactory() const
- {
-     return QQuickTextureFactory::textureFactoryForImage(m_resultImage);
- }
-
-
- RemoteAuthAsyncImageProvider::RemoteAuthAsyncImageProvider()
- {
- }
-
-
- QQuickImageResponse* RemoteAuthAsyncImageProvider::requestImageResponse(const QString &id, const QSize &requestedSize)
- {
-     QUrl iUrl=url()+"/api/friendica/remoteauth?c_url="+contacturl()+"&url="+id;
-     QByteArray loginData = m_login.toLocal8Bit().toBase64();
-     QString headerData = "Basic " + loginData;
-
-     QNetworkRequest request(iUrl);
-     request.setRawHeader("Authorization", headerData.toLocal8Bit());
-     request.setAttribute(QNetworkRequest::FollowRedirectsAttribute,true);
-     request.setUrl(iUrl);
-     return new AsyncImageResponse(request, requestedSize);
- }
-
-
- void RemoteAuthAsyncImageProvider::setContacturl(QString contacturl)
- {
-    if (contacturl!=m_contacturl) {
-        m_contacturl = contacturl;
-        emit contacturlChanged();
-    }
- }
-
-
- void RemoteAuthAsyncImageProvider::setUrl(QString url)
- {
-    if (url!=m_url) {
-        m_url = url;
-        emit urlChanged();
-    }
- }
-
-
- void RemoteAuthAsyncImageProvider::setLogin(QString login)
- {
-    if (login!=m_login) {
-        m_login = login;
-        emit loginChanged();
-    }
- }
-
-
- QString RemoteAuthAsyncImageProvider::contacturl() const
- {
-     return m_contacturl;
- }
-
-
- QString RemoteAuthAsyncImageProvider::url() const
- {
-     return m_url;
- }
-
-
- QString RemoteAuthAsyncImageProvider::login() const
- {
-     return m_login;
- }
diff --git a/source-android/common/remoteauthasyncimageprovider.cpp b/source-android/common/remoteauthasyncimageprovider.cpp
new file mode 120000
index 0000000..e13424b
--- /dev/null
+++ b/source-android/common/remoteauthasyncimageprovider.cpp
@@ -0,0 +1 @@
+../../source-linux/common/remoteauthasyncimageprovider.cpp
\ No newline at end of file
diff --git a/source-android/common/remoteauthasyncimageprovider.h b/source-android/common/remoteauthasyncimageprovider.h
deleted file mode 100644
index f028ada..0000000
--- a/source-android/common/remoteauthasyncimageprovider.h
+++ /dev/null
@@ -1,95 +0,0 @@
-//  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef REMOTEAUTHIMAGEPROVIDER_H
-#define REMOTEAUTHIMAGEPROVIDER_H
-
-#include <QObject>
-#include <QQuickAsyncImageProvider>
-#include <QImage>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QNetworkRequest>
-
-
-class AsyncImageResponse : public QQuickImageResponse
-{
-    Q_OBJECT
-public:
-    explicit AsyncImageResponse(QNetworkRequest req, QSize requestedSize);
-    QQuickTextureFactory *textureFactory() const;
-
-public slots:
-    void onResponseFinished();
-
-protected:
-    QNetworkAccessManager m_imageLoader;
-    QNetworkReply* m_reply;
-    QSize m_requestedSize;
-    QImage m_resultImage;
-    int m_index;
-    QString m_id;
-    QImage m_image;
-};
-
-class RemoteAuthAsyncImageProvider : public QObject, public QQuickAsyncImageProvider
-{
-    Q_OBJECT
-    Q_PROPERTY(QString url READ url WRITE setUrl NOTIFY urlChanged)
-    Q_PROPERTY(QString contacturl READ contacturl WRITE setContacturl NOTIFY contacturlChanged)
-    Q_PROPERTY(QString login READ login WRITE setLogin NOTIFY loginChanged)
-
-public:
-    explicit RemoteAuthAsyncImageProvider();
-    QQuickImageResponse *requestImageResponse(const QString &id, const QSize &requestedSize) override;
-    QString url() const;
-    QString contacturl() const;
-    QString login() const;
-
-signals:
-    void contacturlChanged();
-    void urlChanged();
-    void loginChanged();
-
-public slots:
-    void setContacturl(QString contacturl);
-    void setUrl(QString url);
-    void setLogin(QString login);
-
-private:
-    QByteArray buffer;
-    QString m_url;
-    QString m_contacturl;
-    QString m_login;
-    QString bufferToString();
-};
-
-#endif // REMOTEAUTHIMAGEPROVIDER_H
diff --git a/source-android/common/remoteauthasyncimageprovider.h b/source-android/common/remoteauthasyncimageprovider.h
new file mode 120000
index 0000000..9a79dbe
--- /dev/null
+++ b/source-android/common/remoteauthasyncimageprovider.h
@@ -0,0 +1 @@
+../../source-linux/common/remoteauthasyncimageprovider.h
\ No newline at end of file
diff --git a/source-android/common/updatenews.cpp b/source-android/common/updatenews.cpp
deleted file mode 100644
index b86a172..0000000
--- a/source-android/common/updatenews.cpp
+++ /dev/null
@@ -1,568 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#include "updatenews.h"
-
-#include <QHttpPart>
-#include <QTextCodec>
-#include <QUrlQuery>
-#include <QList>
-#include <QDataStream>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QQmlEngine>
-#include <QSqlQuery>
-#include <QSqlRecord>
-#include <QSqlDatabase>
-#include <QSqlError>
-#include <QDateTime>
-//#include "AndroidNative/systemdispatcher.h"
-
-
-
-UPDATENEWS *UPDATENEWS::instance()
-{
-    static UPDATENEWS udn;
-    return &udn;
-}
-
-UPDATENEWS::UPDATENEWS(QObject *parent) : QObject(parent)
-{
-
-}
-
-void UPDATENEWS::setUrl(QString url)
-{
-   if (url!=m_url) {
-       m_url = url;
-       xhr.setUrl(url);
-       emit urlChanged(m_url);
-   }
-}
-
-
-void UPDATENEWS::setDatabase()
-{
-    static QQmlEngine qe;
-    QString db_url=qe.offlineStorageDatabaseFilePath("Friendiqa");
-    m_db = QSqlDatabase::addDatabase("QSQLITE");
-    m_db.setDatabaseName(QUrl("file://"+db_url+".sqlite").toLocalFile());
-    //qDebug() << db_url;
-
-      if (!m_db.open())
-      {
-         qDebug() << "Error: connection with database fail " << m_db.lastError();
-      }
-}
-
-
-void UPDATENEWS::login()
-{
-    QSqlQuery query("SELECT * FROM config WHERE isActive=0",m_db);
-    while (query.next())
-    {
-       username = query.value(1).toString();
-       QByteArray bpassword=query.value(2).toByteArray();
-       QString password=QByteArray::fromBase64(bpassword);
-       m_login=username+":"+password ;
-       xhr.setLogin(m_login);
-       m_url=query.value(0).toString();
-       xhr.setUrl(m_url);
-       m_imagedir=query.value(3).toString();
-       xhr.setImagedir(m_imagedir);
-       QString isActive=query.value(7).toString();
-    }
-       //m_updateInterval=query.value(5).toInt(); 
-
-
-    QSqlQuery syncquery("SELECT * FROM globaloptions",m_db);
-//    QSqlQuery delquery("DELETE FROM globaloptions WHERE k='sync_interval'",m_db);
-//    delquery.exec();
-    m_updateInterval=0;
-    syncindex=0;
-    synclist.clear();
-       //QSqlQuery syncquery("SELECT * FROM globaloptions WHERE k like 'sync_%' AND v=1",m_db);
-    while (syncquery.next()){
-        if (syncquery.value(0).toString()=="syncinterval"){
-            m_updateInterval=syncquery.value(1).toInt();
-        }
-        if (syncquery.value(0).toString().left(5)=="sync_" && syncquery.value(1).toInt()==1){
-            synclist.append(syncquery.value(0).toString());
-            //qDebug() << " sync " << syncquery.value(0).toString() << " " <<syncquery.value(1).toString();
-        }
-        if (syncquery.value(0).toString().left(7)=="notify_" && syncquery.value(1).toInt()==1){
-            notifylist.append(syncquery.value(0).toString());
-            //qDebug() << " notify " << syncquery.value(0).toString() << " " <<syncquery.value(1).toString();
-        }
-    }
-      // QSqlQuery notifyquery("SELECT * FROM globaloptions WHERE k like 'notify_%' AND v=1",m_db);
-       //qDebug() << "size " << notifyquery.size();
-      // while (notifyquery.next()){
-        //   notifylist.append(syncquery.value(0).toString());
-         //  qDebug() << " notify " << syncquery.value(0).toString();
-       //}
-}
-
-void UPDATENEWS::startsync()
-{        //qDebug()<<"Friendiqa start syncing " <<synclist.length()<<" index "<<syncindex;
-    QObject::connect(&xhr,SIGNAL(success(QByteArray,QString)),this,SLOT(store(QByteArray,QString)));
-    QObject::connect(&xhr,SIGNAL(error(QString,QString,QString,int)),this,SLOT(showError(QString,QString,QString,int)));
-    if (syncindex<synclist.length()){
-        if (synclist[syncindex]=="sync_Timeline"){
-             timeline();
-        } else if (synclist[syncindex]=="sync_Replies") {
-            replies();
-        } else if (synclist[syncindex]=="sync_DirectMessages") {
-            directmessages();
-        } else if (synclist[syncindex]=="sync_Notifications") {
-            notifications();
-        }
-    } else if (syncindex==synclist.length()) {
-        m_api="";
-        if(m_updateInterval!=0){
-            syncindex=0;
-            synclist.clear();
-            m_db.close();
-            m_db.removeDatabase(m_db.connectionName());
-            emit quitapp();
-            alarm.setAlarm(m_updateInterval);
-            m_updateInterval=0;
-        }
-    }
-}
-
-
-void UPDATENEWS::timeline()
-{
-    m_api="/api/statuses/friends_timeline";
-    xhr.clearParams();
-    xhr.setUrl(m_url);
-    xhr.setApi(m_api);
-    QSqlQuery query("SELECT status_id FROM news WHERE messagetype=0 AND username='"+ username +"' ORDER BY status_id DESC LIMIT 1",m_db);
-    if (query.isActive() && query.isSelect()){
-        if (query.first()){
-            QString lastid=query.value(0).toString();
-            xhr.setParam("since_id",lastid);
-        }
-    }
-    xhr.setParam("count","50");
-    xhr.get();
-    QObject::connect(&xhr,SIGNAL(success(QByteArray,QString)),this,SLOT(store(QByteArray,QString)));
-    QObject::connect(&xhr,SIGNAL(error(QString,QString,QString,int)),this,SLOT(showError(QString,QString,QString,int)));
-    QObject::connect(&xhr, SIGNAL(downloaded(QString, QString, QString, int)), this, SLOT(updateImageLocation(QString,QString, QString, int)));
-}
-
-void UPDATENEWS::replies()
-{
-    m_api="/api/statuses/replies";
-    xhr.clearParams();
-    xhr.setUrl(m_url);
-    xhr.setApi(m_api);
-    QSqlQuery query("SELECT status_id FROM news WHERE messagetype=3 AND username='"+ username +"' ORDER BY status_id DESC LIMIT 1",m_db);
-    if (query.isActive() && query.isSelect()){
-        if (query.first()){
-            QString lastid=query.value(0).toString();
-            xhr.setParam("since_id",lastid);
-        }
-    }
-    xhr.setParam("count","50");
-    xhr.get();
-    QObject::connect(&xhr,SIGNAL(success(QByteArray,QString)),this,SLOT(store(QByteArray,QString)));
-    QObject::connect(&xhr,SIGNAL(error(QString,QString,QString,int)),this,SLOT(showError(QString,QString,QString,int)));
-    QObject::connect(&xhr, SIGNAL(downloaded(QString, QString, QString, int)), this, SLOT(updateImageLocation(QString,QString, QString, int)));
-}
-
-void UPDATENEWS::directmessages()
-{
-    m_api="/api/direct_messages/all";
-    xhr.clearParams();
-    xhr.setUrl(m_url);
-    xhr.setApi(m_api);
-    QSqlQuery query("SELECT status_id FROM news WHERE messagetype=1 AND username='"+ username +"' ORDER BY status_id DESC LIMIT 1",m_db);
-    if (query.isActive() && query.isSelect()){
-        if (query.first()){
-            QString lastid=query.value(0).toString();
-            xhr.setParam("since_id",lastid);
-        }
-    }
-    xhr.get();
-    QObject::connect(&xhr,SIGNAL(success(QByteArray,QString)),this,SLOT(store(QByteArray,QString)));
-    QObject::connect(&xhr,SIGNAL(error(QString,QString,QString,int)),this,SLOT(showError(QString,QString,QString,int)));
-    QObject::connect(&xhr, SIGNAL(downloaded(QString, QString, QString, int)), this, SLOT(updateImageLocation(QString,QString, QString, int)));
-}
-
-void UPDATENEWS::notifications()
-{
-    m_api="/api/friendica/notifications";
-    xhr.clearParams();
-    xhr.setUrl(m_url);
-    xhr.setApi(m_api);
-    xhr.get();
-    QObject::connect(&xhr,SIGNAL(success(QByteArray,QString)),this,SLOT(store(QByteArray,QString)));
-    QObject::connect(&xhr,SIGNAL(error(QString,QString,QString,int)),this,SLOT(showError(QString,QString,QString,int)));
-    QObject::connect(&xhr, SIGNAL(downloaded(QString, QString, QString, int)), this, SLOT(updateImageLocation(QString,QString, QString, int)));
-}
-
-
-void UPDATENEWS::store(QByteArray serverreply,QString apiname)
-{   if (apiname!=m_api || xhr.downloadtype()!=""){} else {
-        QJsonDocument news;
-        //qDebug()<<apiname << serverreply;
-        QJsonParseError jsonerror;
-        news=QJsonDocument::fromJson(serverreply,&jsonerror);
-        if (news.isArray()){
-            for (int i=0; i < news.array().count();i++){
-                QJsonValue newsitem=news[i];
-                if (apiname=="/api/friendica/notifications"){
-                    QSqlQuery testquery("SELECT status_id FROM news WHERE status_id=" + QString::number(newsitem["id"].toInt()) + " AND messagetype=2 AND username='"+ username +"'",m_db);
-                    if (testquery.first()) {continue;}
-                }
-                QSqlQuery query(m_db);
-                query.prepare("INSERT INTO news (username,messagetype,text,created_at,in_reply_to_status_id,source,status_id,in_reply_to_user_id,geo,favorited,uid,statusnet_html,statusnet_conversation_id,friendica_activities,friendica_activities_self,attachments,friendica_owner) " "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
-                query.bindValue(0,username);
-                query.bindValue(1,"0");
-                query.bindValue(2, newsitem["text"].toString().toUtf8().toBase64());
-                QString sourcedate=newsitem["created_at"].toString();
-                QString formateddate=sourcedate.mid(0,3)+", "+sourcedate.mid(8,3)+sourcedate.mid(4,3)+sourcedate.mid(25,5)+sourcedate.mid(10,15);
-                query.bindValue(3,QDateTime::fromString(formateddate,Qt::RFC2822Date).toMSecsSinceEpoch() );
-                if(newsitem["in_reply_to_status_id"]!=QJsonValue::Null){query.bindValue(4, newsitem["in_reply_to_status_id"].toInt());}
-                query.bindValue(5,newsitem["source"]);
-                query.bindValue(6,newsitem["id"].toInt());
-                if(newsitem["in_reply_to_user_id"]!=QJsonValue::Null){ query.bindValue(7,newsitem["in_reply_to_user_id"].toInt());}
-                query.bindValue(8,newsitem["geo"]);
-                query.bindValue( 9, newsitem["favorited"].toInt());
-                query.bindValue(10, newsitem["user"]["id"].toInt());
-                query.bindValue(11, newsitem["statusnet_html"].toString().toUtf8().toBase64());
-                query.bindValue(12, newsitem["statusnet_conversation_id"].toInt());
-                QJsonArray likeArray;QJsonArray dislikeArray;QJsonArray attendyesArray;QJsonArray attendnoArray;QJsonArray attendmaybeArray;
-                if (newsitem.toObject().contains("friendica_activities")){
-                    for (int a=0; a < newsitem["friendica_activities"]["like"].toArray().count();a++){
-                        likeArray.append(newsitem["friendica_activities"]["like"][a]["url"].toString());
-                    }
-                    for (int b=0; b < newsitem["friendica_activities"]["dislike"].toArray().count();b++){
-                        dislikeArray.append(newsitem["friendica_activities"]["dislike"][b]["url"].toString());
-                    }
-                    for (int c=0; c < newsitem["friendica_activities"]["attendyes"].toArray().count();c++){
-                        attendyesArray.append(newsitem["friendica_activities"]["attendyes"][c]["url"].toString());
-                    }
-                    for (int d=0; d < newsitem["friendica_activities"]["attendno"].toArray().count();d++){
-                        attendnoArray.append(newsitem["friendica_activities"]["attendno"][d]["url"].toString());
-                    }
-                    for (int e = 0; e < newsitem["friendica_activities"]["attendmaybe"].toArray().count();e++){
-                        attendmaybeArray.append(newsitem["friendica_activities"]["attendmaybe"][e]["url"].toString());
-                    }
-                 }
-                QJsonArray friendica_activities; friendica_activities={likeArray,dislikeArray,attendyesArray,attendnoArray,attendmaybeArray};
-                QJsonDocument activities; activities.setArray(friendica_activities);
-                query.bindValue(13,activities.toJson(QJsonDocument::Compact).toBase64());
-                query.bindValue(14,"[]");
-
-                if (newsitem["attachments"]!=QJsonValue::Undefined){
-                    query.bindValue(15, QJsonDocument(newsitem["attachments"].toArray()).toJson(QJsonDocument::Compact).toBase64());
-                }else {
-                    query.bindValue(15, "");
-                }
-
-                if (newsitem["friendica_author"]!=QJsonValue::Undefined){
-                    query.bindValue(16, newsitem["friendica_author"]["url"]);
-                }else {
-                    query.bindValue(16, newsitem["user"]["url"]);
-                   }
-
-                if (apiname=="/api/statuses/replies"){
-                    query.bindValue(1,"3");
-                }
-                if (apiname == "/api/direct_messages/all"){
-                    query.bindValue(1,"1");
-                    query.bindValue(5,"Friendica");
-                    if(newsitem["recipient"]["id"]!=QJsonValue::Null){ query.bindValue(7,newsitem["recipient"]["id"].toInt());}
-                    query.bindValue(10, newsitem["sender_id"].toInt());
-                    query.bindValue(11, newsitem["text"].toString().toUtf8().toBase64());
-                    if(newsitem["friendica_parent_uri"]!=QJsonValue::Null){ query.bindValue(12,newsitem["friendica_parent_uri"]);}
-                    query.bindValue(16, newsitem["sender"]["url"]);
-                }
-                if (apiname == "/api/friendica/notifications"){
-                    query.bindValue(1,"2");
-                    query.bindValue(3,QDateTime::fromString(newsitem["date"].toString(),"yyyy-MM-dd hh:mm:ss").toMSecsSinceEpoch());
-                    query.bindValue(5,"Friendica");
-                    QJsonObject cleancontact= findNotificationContact(newsitem["url"].toString());
-                    query.bindValue(10, cleancontact["id"].toInt());
-                    query.bindValue(11, newsitem["msg_html"].toString().toUtf8().toBase64());
-                    if(newsitem["parent"]!=QJsonValue::Null){ query.bindValue(12,newsitem["parent"]);}
-                    query.bindValue(16, newsitem["url"]);
-                }
-
-                if(!(query.exec())) {qDebug()<<query.lastError();}
-
-                // notifications
-                if (apiname=="/api/statuses/friends_timeline"){
-                    if(notifylist.contains("notify_Timeline")){
-                        alarm.notify("Home: "+ newsitem["user"]["name"].toString(),newsitem["text"].toString(),0);
-                    }
-                }
-                if (apiname=="/api/statuses/replies"){
-                    if(notifylist.contains("notify_Replies")){
-                        alarm.notify("Replies: "+newsitem["user"]["name"].toString(),newsitem["text"].toString(),1);
-                    }
-                }
-                if (apiname=="/api/direct_messages/all"){
-                    if(notifylist.contains("notify_DirectMessages")){
-                        alarm.notify("DirectMessage: "+newsitem["sender"]["name"].toString(),newsitem["text"].toString(),2);
-                    }
-                }
-                if (apiname=="/api/friendica/notifications"){
-                    if(notifylist.contains("notify_Notifications")){
-                        alarm.notify("Notification: "+newsitem["name"].toString(),newsitem["text"].toString(),3);
-                    }
-                }
-            }
-            QList<QJsonValue> newcontacts=findNewContacts(news);
-            //qDebug()<< "new contacts count " << newcontacts.size();
-            if (newcontacts.size()>0){
-                updateContacts(newcontacts);
-                startImagedownload();
-
-            } else {
-                if(m_updateInterval!=0){
-                    syncindex+=1;
-                    startsync();
-                }
-            }
-        }
-        else {
-            qDebug()<< "Friendiqa updatenews error " << serverreply;
-            emit this->error(m_api,QTextCodec::codecForName("utf-8")->toUnicode(serverreply));
-            syncindex+=1;
-            startsync();
-        }
-    }
-
-}
-
-
-
-void UPDATENEWS::updateImageLocation(QString downloadtype,QString imageurl, QString filename, int index){
-    if (downloadtype=="contactlist"){
-        QSqlQuery testquery("SELECT profile_image FROM contacts WHERE profile_image_url ='"+imageurl+ "' AND username = '" +username+"'",m_db);
-        testquery.first();
-        //qDebug()<< "update imageurl for " <<imageurl << " from " <<testquery.value(0).toString() <<" to "<< filename <<" index " << index << " newcontactnames.length " <<newcontactnames.length();
-        QSqlQuery query("UPDATE contacts SET profile_image='"+ filename +"' WHERE profile_image_url ='"+imageurl+ "' AND username = '" +username+"'",m_db);
-        query.exec();
-        if (index==(newcontactnames.length()-1)){
-            newcontactnames.clear();
-            newcontactimagelinks.clear();
-            if(m_updateInterval!=0){
-                syncindex+=1;
-                startsync();
-            }
-        }
-    }
-}
-
-QJsonObject UPDATENEWS::findNotificationContact(QString contacturl){
-    QSqlQuery query("SELECT id,url FROM contacts WHERE url='"+contacturl+"' AND username='"+ username+"'",m_db);
-    query.first();
-    QJsonObject contact{
-        {"id", query.value(0).toInt()},
-        {"url", query.value(1).toString()}
-    };
-    return contact;
-}
-
-QList <QJsonValue> UPDATENEWS::findNewContacts(QJsonDocument news){
-    QSqlQuery query("SELECT profile_image_url FROM contacts",m_db);
-    QList<QString> imageurls;
-    while (query.next()){
-        imageurls.append(query.value(0).toString());
-    }
-    QList<QJsonValue> newcontacts;
-    //qDebug()<<"updatenews findcontacts news count "<<news.array().count();
-
-    for (int i=0; i<news.array().count();i++){
-        //main contacts
-        if(imageurls.contains(news[i]["user"]["profile_image_url"].toString().section('?',0,0)) || newcontactimagelinks.contains(news[i]["user"]["profile_image_url"].toString().section('?',0,0))){
-            }
-        else{
-            newcontacts.append(news[i]["user"]);
-            newcontactimagelinks.append(news[i]["user"]["profile_image_url"].toString().section('?',0,0));
-            newcontactnames.append(news[i]["user"]["screen_name"].toString());
-        }
-        //like/dislike contacts
-        if (news[i].toObject().contains("friendica_activities") ){
-            for (int a=0; a < news[i]["friendica_activities"]["like"].toArray().count();a++){
-                if(imageurls.contains(news[i]["friendica_activities"]["like"][a]["profile_image_url"].toString().section('?',0,0)) || newcontactimagelinks.contains(news[i]["friendica_activities"]["like"][a]["profile_image_url"].toString().section('?',0,0))){
-                    }
-                else{
-                    newcontacts.append(news[i]["friendica_activities"]["like"][a]);
-                    newcontactimagelinks.append(news[i]["friendica_activities"]["like"][a]["profile_image_url"].toString().section('?',0,0));
-                    newcontactnames.append(news[i]["friendica_activities"][a]["screen_name"].toString());
-                }
-            }
-            for (int b=0; b < news[i]["friendica_activities"]["dislike"].toArray().count();b++){
-                if(imageurls.contains(news[i]["friendica_activities"]["dislike"][b]["profile_image_url"].toString().section('?',0,0)) || newcontactimagelinks.contains(news[i]["friendica_activities"]["dislike"][b]["profile_image_url"].toString().section('?',0,0))){
-                    }
-                else{
-                    newcontacts.append(news[i]["friendica_activities"]["dislike"][b]);
-                    newcontactimagelinks.append(news[i]["friendica_activities"]["dislike"][b]["profile_image_url"].toString().section('?',0,0));
-                    newcontactnames.append(news[i]["friendica_activities"][b]["screen_name"].toString());
-                }
-            }
-        }
-        //owner contacts
-        if (news[i].toObject().contains("friendica_author") ){
-            if(imageurls.contains(news[i]["friendica_author"]["profile_image_url"].toString().section('?',0,0)) || newcontactimagelinks.contains(news[i]["friendica_owner"]["profile_image_url"].toString().section('?',0,0))){
-                }
-            else{
-                newcontacts.append(news[i]["friendica_author"]);
-                newcontactimagelinks.append(news[i]["friendica_author"]["profile_image_url"].toString().section('?',0,0));
-                newcontactnames.append(news[i]["friendica_author"]["screen_name"].toString());
-            }
-          }
-    }
-    return newcontacts;
-}
-
-
-void UPDATENEWS::updateContacts(QList<QJsonValue> contacts){
-    qint64 currentTime =QDateTime::currentMSecsSinceEpoch();
-    for (int i=0; i < contacts.count();i++){
-        QJsonValue contact=contacts[i];
-        QSqlQuery query(m_db);
-        //qDebug() << "updatecontact " << contact["screen_name"];
-        QSqlQuery testquery("SELECT url FROM contacts WHERE username='"+ username +"' AND url='" + contact["url"].toString() +"'",m_db);
-        if (testquery.first()){
-            query.prepare("UPDATE contacts SET id=?, name=?, screen_name=?, location=?,imageAge=?,"
-                      "profile_image_url=?, description=?, protected=?, followers_count=?,"
-                      "friends_count=?, created_at=?, favourites_count=?, utc_offset=?, time_zone=?, statuses_count=?,"
-                      "following=?, verified=?, statusnet_blocking=?, notifications=?, statusnet_profile_url=?, cid=?, network=?, timestamp=? "
-                      " WHERE username='"+ username +"' AND url='" + contact["url"].toString() +"'");
-            query.bindValue(0, contact["id"].toInt());
-            query.bindValue(1, contact["name"].toString().toUtf8().toBase64());
-            query.bindValue(2, contact["screen_name"]);
-            query.bindValue(3, contact["location"]);
-            query.bindValue(4, currentTime);
-            query.bindValue(5, contact["profile_image_url"].toString().section('?',0,0));
-            if(contact["description"].isNull() ){query.bindValue(6,"");}else{query.bindValue(6, contact["description"].toString().toUtf8().toBase64());}
-            query.bindValue(7,contact["protected"].toBool());
-            query.bindValue(8,contact["followers_count"].toInt());
-            query.bindValue(9,contact["friends_count"].toInt());
-            QString sourcedate=contact["created_at"].toString();
-            QString formateddate=sourcedate.mid(0,3)+", "+sourcedate.mid(8,3)+sourcedate.mid(4,3)+sourcedate.mid(25,5)+sourcedate.mid(10,15);
-            query.bindValue(10,QDateTime::fromString(formateddate,Qt::RFC2822Date).toMSecsSinceEpoch() );
-            query.bindValue(11,contact["favorites_count"].toInt());
-            query.bindValue(12,contact["utc_offset"].toInt());
-            query.bindValue(13,contact["time_zone"].toString());
-            query.bindValue(14,contact["statuses_count"].toInt());
-            query.bindValue(15,contact["following"].toBool());
-            query.bindValue(16,contact["verfied"].toBool());
-            query.bindValue(17,contact["statusnet_blocking"].toBool());
-            query.bindValue(18,contact["notifications"].toBool());
-            query.bindValue(19,contact["statusnet_profile_url"]);
-            query.bindValue(20,contact["cid"].toInt());
-            query.bindValue(21,contact["network"]);
-            qint64 timestamp=0;
-            QString timestamphelper=contact["profile_image_url"].toString();
-            try {timestamp=timestamphelper.mid(timestamphelper.indexOf("?ts")+4,timestamphelper.length()).toUInt();} catch(...){}
-            query.bindValue(22,timestamp);
-        }
-
-        else{
-            query.prepare("INSERT INTO contacts (username, id, name, screen_name, location,imageAge,"
-                      "profile_image_url, description, profile_image, url, protected, followers_count,"
-                      "friends_count, created_at, favourites_count, utc_offset, time_zone, statuses_count,"
-                      "following, verified, statusnet_blocking, notifications, statusnet_profile_url, cid, network, isFriend, timestamp)"
-                      "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
-
-            query.bindValue(0,username);
-            query.bindValue(1, contact["id"].toInt());
-            query.bindValue(2, contact["name"].toString().toUtf8().toBase64());
-            query.bindValue(3, contact["screen_name"]);
-            query.bindValue(4, contact["location"]);
-            query.bindValue(5, currentTime);
-            query.bindValue(6, contact["profile_image_url"].toString().section('?',0,0));
-            if(contact["description"].isNull() ){query.bindValue(7,"");}else{query.bindValue(7, contact["description"].toString().toUtf8().toBase64());}
-            query.bindValue(8,"none");
-            query.bindValue(9, contact["url"].toString());
-            query.bindValue(10,contact["protected"].toBool());
-            query.bindValue(11,contact["followers_count"].toInt());
-            query.bindValue(12,contact["friends_count"].toInt());
-            QString sourcedate=contact["created_at"].toString();
-            QString formateddate=sourcedate.mid(0,3)+", "+sourcedate.mid(8,3)+sourcedate.mid(4,3)+sourcedate.mid(25,5)+sourcedate.mid(10,15);
-            query.bindValue(13,QDateTime::fromString(formateddate,Qt::RFC2822Date).toMSecsSinceEpoch() );
-            query.bindValue(14,contact["favorites_count"].toInt());
-            query.bindValue(15,contact["utc_offset"].toInt());
-            query.bindValue(16,contact["time_zone"].toString());
-            query.bindValue(17,contact["statuses_count"].toInt());
-            query.bindValue(18,contact["following"].toBool());
-            query.bindValue(19,contact["verfied"].toBool());
-            query.bindValue(20,contact["statusnet_blocking"].toBool());
-            query.bindValue(21,contact["notifications"].toBool());
-            query.bindValue(22,contact["statusnet_profile_url"]);
-            query.bindValue(23,contact["cid"].toInt());
-            query.bindValue(24,contact["network"]);
-            query.bindValue(25, 0);
-            qint64 timestamp=0;
-            QString timestamphelper=contact["profile_image_url"].toString();
-            try {timestamp=timestamphelper.mid(timestamphelper.indexOf("?ts")+4,timestamphelper.length()).toUInt();} catch(...){}
-            query.bindValue(26,timestamp);
-
-        }
-        query.exec() ;
-    }
-}
-
-QString UPDATENEWS::url() const
-{
-    return m_url;
-}
-
-void UPDATENEWS::startImagedownload()
-{
-    //qDebug() << "start image download";
-    xhr.setDownloadtype("contactlist");
-    xhr.setFilelist(newcontactimagelinks);
-    xhr.setContactlist(newcontactnames);
-    xhr.setImagedir(m_imagedir);
-    xhr.getlist();
-}
-
-void UPDATENEWS::showError(QString data, QString url,QString api, int code )
-{
-    qDebug() << "showerror " << api << " data " << data;
-    emit this->error(api,data);
-    if (api!=m_api || xhr.downloadtype()!=""){} else{
-        if(m_updateInterval!=0){
-            syncindex+=1;
-            startsync();
-        }
-    }
-}
diff --git a/source-android/common/updatenews.cpp b/source-android/common/updatenews.cpp
new file mode 120000
index 0000000..4d79e7e
--- /dev/null
+++ b/source-android/common/updatenews.cpp
@@ -0,0 +1 @@
+../../source-linux/common/updatenews.cpp
\ No newline at end of file
diff --git a/source-android/common/updatenews.h b/source-android/common/updatenews.h
deleted file mode 100644
index 74acf20..0000000
--- a/source-android/common/updatenews.h
+++ /dev/null
@@ -1,100 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef UPDATENEWS_H
-#define UPDATENEWS_H
-
-#include <QObject>
-#include <QJsonObject>
-#include <QSqlDatabase>
-#include "xhr.h"
-#include "alarm.h"
-//#include "AndroidNative/systemdispatcher.h"
-
-class UPDATENEWS : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString url READ url WRITE setUrl NOTIFY urlChanged)
-//    Q_PROPERTY(QString login READ login NOTIFY loginChanged)
-public:
-    static UPDATENEWS *instance();
-
-    explicit UPDATENEWS(QObject *parent = 0);
-  
-    QString url() const;
-    //QString login() const;
-
-signals:
-
-    void urlChanged(QString url);
-    void success(QString api);
-    void error(QString api, QString content);
-    void quitapp();
-
-public slots:
-    void setUrl(QString url);
-    void setDatabase();
-    void login();
-    void timeline();
-    void replies();
-    void startsync();
-    void directmessages();
-    void notifications();
-    //void startservice(QString type,QVariantMap map);
-    void startImagedownload();
-    void updateImageLocation(QString downloadtype,QString imageurl, QString filename, int index);
-    void store(QByteArray serverreply,QString apiname);
-    void showError(QString data, QString url,QString api, int code);
-
-private:
-    QString m_url;
-    QString m_api;
-    QString m_imagedir;
-    QString m_login;
-    QString username;
-    int syncindex;
-    QSqlDatabase m_db;
-    QList<QString> synclist;
-    QList <QString> notifylist;
-    QList<QJsonValue> findNewContacts(QJsonDocument news);
-    QJsonObject findNotificationContact(QString imagelink);
-    int m_updateInterval;
-    //void timeline();
-    //void store(QByteArray serverreply,QString apiname);
-    void updateContacts(QList<QJsonValue> contacts);
-
-    XHR xhr;
-    ALARM alarm;
-    QList<QString> newcontactimagelinks;
-    QList<QString> newcontactnames;
-};
-
-#endif // UPDATENEWS_H
diff --git a/source-android/common/updatenews.h b/source-android/common/updatenews.h
new file mode 120000
index 0000000..f506bd0
--- /dev/null
+++ b/source-android/common/updatenews.h
@@ -0,0 +1 @@
+../../source-linux/common/updatenews.h
\ No newline at end of file
diff --git a/source-android/common/uploadableimage.cpp b/source-android/common/uploadableimage.cpp
deleted file mode 100644
index 7ef3524..0000000
--- a/source-android/common/uploadableimage.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-//  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#include "uploadableimage.h"
-
-
-#include <QBuffer>
-#include <QDebug>
-#include <QFileInfo>
-#include <QUrl>
-
-void UploadableImage::setSource(const QString &a) {
-    if (a != m_source) {
-        m_source = a;
-        //m_base64 = "";
-        m_mimetype = "";
-        m_filename = "";
-
-        qDebug() << "UploadableImage::setSource : " << m_source;
-
-        if (m_source=="") {
-            emit sourceChanged();
-            //emit base64Changed();
-            emit mimetypeChanged();
-            emit filenameChanged();
-            return;
-        }
-
-        QImage fullimage = QImage(QUrl(m_source).toLocalFile());
-        if (fullimage.width() > 800 || fullimage.height() > 800) {
-            if (fullimage.width() > fullimage.height()) {
-                m_image = fullimage.scaledToWidth(800);
-            } else {
-                m_image = fullimage.scaledToHeight(800);
-            }
-        } else {
-            m_image = fullimage;
-        }
-        qDebug() << "UploadableImage::setSource : " << m_image.width() << "x" << m_image.height();
-        emit sourceChanged();
-
-        QFileInfo fi(m_source);
-
-        m_filename = fi.fileName();
-        emit filenameChanged();
-
-        QString filetype = fi.suffix().toUpper();
-        if (filetype!="PNG" && filetype!="JPG") {
-            filetype = "JPG";
-        }
-        qDebug() << "UploadableImage::setSource : " << "Saving as " << filetype;
-
-        m_mimetype = "image/"+filetype.toLower();
-        emit mimetypeChanged();
-
-        /*
-        QByteArray byteArray;
-        QBuffer buffer(&byteArray);
-        m_image.save(&buffer, filetype.toLatin1().constData());
-        QString b64 = QString::fromLatin1(byteArray.toBase64().data());
-
-        for(int k=0; k<b64.length(); k+=76) {
-            m_base64 += b64.mid(k,76) + "\n";
-        }
-        m_base64 = m_base64.trimmed();
-
-        emit base64Changed();
-        */
-    }
-}
-
-QString UploadableImage::source() const {
-    return m_source;
-}
-
-//QString UploadableImage::base64() const {
-//    return m_base64;
-//}
-
-QString UploadableImage::filename() const {
-    return m_filename;
-}
-
-QString UploadableImage::mimetype() const {
-    return m_mimetype;
-}
-
-QByteArray UploadableImage::bytes() {
-    QByteArray byteArray;
-    QBuffer buffer(&byteArray);
-    m_image.save(&buffer, "PNG");
-    return byteArray;
-}
diff --git a/source-android/common/uploadableimage.cpp b/source-android/common/uploadableimage.cpp
new file mode 120000
index 0000000..069ff8f
--- /dev/null
+++ b/source-android/common/uploadableimage.cpp
@@ -0,0 +1 @@
+../../source-linux/common/uploadableimage.cpp
\ No newline at end of file
diff --git a/source-android/common/uploadableimage.h b/source-android/common/uploadableimage.h
deleted file mode 100644
index 665bf82..0000000
--- a/source-android/common/uploadableimage.h
+++ /dev/null
@@ -1,71 +0,0 @@
-//  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef UPLOADABLEIMAGE_H
-#define UPLOADABLEIMAGE_H
-
-#include <QObject>
-#include <QQuickItem>
-#include <QImage>
-
-class UploadableImage : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString source READ source WRITE setSource NOTIFY sourceChanged)
-    //Q_PROPERTY(QString base64 READ base64 NOTIFY base64Changed)
-    Q_PROPERTY(QString filename READ filename NOTIFY filenameChanged)
-    Q_PROPERTY(QString mimetype READ mimetype NOTIFY mimetypeChanged)
-    Q_PROPERTY(QByteArray bytes READ bytes)
-
-public:
-    void setSource(const QString &a);
-    QString source() const;
-
-    //QString base64() const;
-    QString filename() const;
-    QString mimetype() const;
-
-    QByteArray bytes();
-signals:
-    void sourceChanged();
-    //void base64Changed();
-    void filenameChanged();
-    void mimetypeChanged();
-
-private:
-    QString m_source;
-    QImage m_image;
-    //QString m_base64;
-    QString m_filename;
-    QString m_mimetype;
-};
-
-#endif // UPLOADABLEIMAGE_H
diff --git a/source-android/common/uploadableimage.h b/source-android/common/uploadableimage.h
new file mode 120000
index 0000000..32396a1
--- /dev/null
+++ b/source-android/common/uploadableimage.h
@@ -0,0 +1 @@
+../../source-linux/common/uploadableimage.h
\ No newline at end of file
diff --git a/source-android/common/xhr.cpp b/source-android/common/xhr.cpp
deleted file mode 100644
index fd29d29..0000000
--- a/source-android/common/xhr.cpp
+++ /dev/null
@@ -1,369 +0,0 @@
-//  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#include "xhr.h"
-
-#include <QHttpPart>
-#include <QTextCodec>
-#include <QUrlQuery>
-#include <QList>
-#include <QDataStream>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include "uploadableimage.h"
-
-XHR *XHR::instance()
-{
-    static XHR xhr;
-    return &xhr;
-}
-
-XHR::XHR(QObject *parent) : QObject(parent)
-{
-    request.setSslConfiguration(QSslConfiguration::defaultConfiguration());
-}
-
-void XHR::setUrl(QString url)
-{
-   if (url!=m_url) {
-       m_url = url;
-       emit urlChanged();
-   }
-}
-
-void XHR::setApi(QString api)
-{
-   if (api!=m_api) {
-       m_api = api;
-       emit apiChanged();
-   }
-}
-
-void XHR::setLogin(QString login)
-{
-   if (login!=m_login) {
-       m_login = login;
-       emit loginChanged();
-   }
-}
-
-void XHR::setFilename(QString filename)
-{
-   if (filename!=m_filename) {
-       m_filename = filename;
-       emit filenameChanged();
-   }
-}
-
-void XHR::setContactlist(QList<QString> contactlist)
-{
-   if (contactlist!=m_contactlist) {
-       m_contactlist = contactlist;
-       emit contactlistChanged();
-   }
-}
-
-void XHR::setFilelist(QList<QString> filelist)
-{
-   if (filelist!=m_filelist) {
-       m_filelist = filelist;
-       emit filelistChanged();
-   }
-}
-
-void XHR::setImagedir(QString imagedir)
-{
-   if (imagedir!=m_imagedir) {
-       m_imagedir = imagedir;
-       emit imagedirChanged();
-   }
-}
-void XHR::setDownloadtype(QString downloadtype)
-{
-   if (downloadtype!=m_downloadtype) {
-       m_downloadtype = downloadtype;
-       emit downloadtypeChanged();
-   }
-}
-
-QString XHR::url() const
-{
-    return m_url;
-}
-
-QString XHR::api() const
-{
-    return m_api;
-}
-
-QString XHR::login() const
-{
-    return m_login;
-}
-
-QString XHR::filename() const
-{
-    return m_filename;
-}
-
-QList<QString> XHR::contactlist() const
-{
-    return m_contactlist;
-}
-
-QList<QString> XHR::filelist() const
-{
-    return m_filelist;
-}
-
-QString XHR::imagedir() const
-{
-    return m_imagedir;
-}
-
-QString XHR::downloadtype() const
-{
-    return m_downloadtype;
-}
-
-QString XHR::networktype()
-{
-    return nc.bearerTypeFamily() + nc.bearerTypeName();
-}
-
-void XHR::setParam(QString name, QString value)
-{
-    params.insert(name, value);
-}
-
-void XHR::setImageFileParam(QString name, QString url)
-{
-    files.insert(name, url);
-}
-
-void XHR::clearParams()
-{
-    files.clear();
-    params.clear();
-}
-
-void XHR::download()
-{
-    QUrl requrl(m_url);
-    if(m_downloadtype=="picturelist"){
-        QByteArray loginData = m_login.toLocal8Bit().toBase64();
-        QString headerData = "Basic " + loginData;
-        request.setRawHeader("Authorization", headerData.toLocal8Bit());
-    }
-    request.setUrl(requrl);
-    reply = manager.get(request);
-    reply->ignoreSslErrors();
-    connect(reply, &QNetworkReply::readyRead,this, &XHR::onReadyRead);
-    //connect(reply,SIGNAL(downloadProgress(qint64,qint64)), this,SLOT(updateDownloadProgress(qint64,qint64)));
-    connect(reply, &QNetworkReply::finished,this, &XHR::onRequestFinished);
-    connect(reply, &QNetworkReply::sslErrors, this, &XHR::onSSLError);
-    connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onReplyError(QNetworkReply::NetworkError)));
-}
-
-void XHR::get()
-{
-    QUrlQuery query;
-
-    QHashIterator<QString, QString> i(params);
-    while(i.hasNext()) {
-        i.next();
-        query.addQueryItem(i.key(), i.value());
-        //qDebug()<<i.key() << " value "<< i.value();
-    }
-
-    QUrl requrl(m_url+m_api);
-    //qDebug() << "API "<< requrl<<m_api;
-    requrl.setQuery(query);
-    QByteArray loginData = m_login.toLocal8Bit().toBase64();
-    QString headerData = "Basic " + loginData;
-    request.setRawHeader("Authorization", headerData.toLocal8Bit());
-    request.setUrl(requrl);
-    reply = manager.get(request);
-
-    connect(reply, &QNetworkReply::finished, this, &XHR::onReplySuccess);
-    connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onReplyError(QNetworkReply::NetworkError)));
-    connect(reply, &QNetworkReply::readyRead, this, &XHR::onReadyRead);
-    connect(reply, &QNetworkReply::sslErrors, this, &XHR::onSSLError);
-}
-
-void XHR::getlist()
-{
-    if(dlindex < m_filelist.size()) {
-        QString cleanfilename;
-        if (m_downloadtype=="contactlist"){cleanfilename = m_contactlist.at(dlindex)+"-"+ m_filelist.at(dlindex).section('/',-1).section('?',0,0);
-            XHR::setFilename(imagedir()+"contacts/"+cleanfilename);
-            XHR::setUrl(m_filelist.at(dlindex));}
-        else {
-            XHR::setUrl(m_filelist.at(dlindex));}
-        XHR::download();
-    } else {dlindex=0;m_downloadtype="";m_contactlist.clear();m_filelist.clear();}
-}
-
-
-void XHR::post()
-{
-    //qDebug() << "start post to " << m_url;
-    QHttpMultiPart *multiPart = new QHttpMultiPart(QHttpMultiPart::FormDataType);
-
-    QHashIterator<QString, QString> iparams(params);
-    while(iparams.hasNext()) {
-        iparams.next();
-        //qDebug() << "\t add param " << iparams.key() << " : " << iparams.value();
-        QHttpPart textPart;
-        textPart.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"" + iparams.key() + "\""));
-
-
-        textPart.setBody(iparams.value().toUtf8());
-        multiPart->append(textPart);
-    }
-
-    UploadableImage uimg;
-    QHashIterator<QString, QString> ifiles(files);
-    while(ifiles.hasNext()) {
-        ifiles.next();
-
-        uimg.setSource(ifiles.value());
-        //qDebug() << "\t image: " << uimg.mimetype() << ", " << ifiles.key();
-
-        QHttpPart imagePart;
-        imagePart.setHeader(QNetworkRequest::ContentTypeHeader, QVariant(uimg.mimetype()));
-        imagePart.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"" + ifiles.key() + "\"; filename=\""+uimg.filename()+"\""));
-        imagePart.setBody(uimg.bytes());
-        multiPart->append(imagePart);
-    }
-
-    QByteArray loginData = m_login.toLocal8Bit().toBase64();
-    QString headerData = "Basic " + loginData;
-    request.setRawHeader(QByteArray("Authorization"), headerData.toLocal8Bit());
-
-    request.setUrl(m_url+m_api);
-    reply = manager.post(request, multiPart);
-    qDebug() << "\t request sent";
-    connect(reply, &QNetworkReply::finished, this, &XHR::onReplySuccess);
-    connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onReplyError(QNetworkReply::NetworkError)));
-    connect(reply, &QNetworkReply::readyRead, this, &XHR::onReadyRead);
-    connect(reply, &QNetworkReply::sslErrors, this, &XHR::onSSLError);
-    qDebug() << "\t reply signals connected";
-}
-
-void XHR::onReplyError(QNetworkReply::NetworkError code)
-{
-    qDebug() << code;
-    emit this->error( bufferToString(), m_url,m_api, (int) code);
-    buffer.clear();
-    reply->deleteLater();
-}
-
-void XHR::onReplySuccess()
-{
-    qDebug() << "!";
-    emit this->success(buffer, m_api);
-    buffer.clear();
-//    reply->deleteLater();
-}
-
-void XHR::onRequestFinished()
-{
-    qDebug()<<"download requestFinished ";
-    // Save the file here
-    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);
-        QJsonObject jsonObject = jsonResponse.object();
-        int arraystart=buffer.indexOf('{"data":"')+8;
-        int arraylength=buffer.indexOf('"',9)-arraystart;
-        QByteArray b64=buffer.mid(arraystart,arraylength);
-        QString helpfilename=jsonObject["filename"].toString();
-        QString helpfile=helpfilename.left(helpfilename.lastIndexOf("."));
-        QString filesuffix="";
-        if (jsonObject["type"].toString()=="image/jpeg"){filesuffix=".jpg";}
-        else if (jsonObject["type"].toString()=="image/png"){filesuffix=".png";}
-        else {filesuffix="";}
-        if (helpfilename==""){// check if file has any filename
-            helpfile=jsonObject["id"].toString();
-            setFilename(imagedir()+"albums/"+jsonObject["album"].toString()+"/"+jsonObject["id"].toString()+filesuffix);
-        }
-        else{setFilename(imagedir()+"albums/"+jsonObject["album"].toString()+"/"+helpfile+filesuffix);}
-        //qDebug()<<"Filename "<<m_filename;
-        QFile file(m_filename);
-        file.open(QIODevice::WriteOnly);
-        file.write(QByteArray::fromBase64(b64));
-        buffer.clear();
-        b64.clear();
-        file.close();
-        jsonObject["data"]="";
-        jsonObject["filename"]=helpfile+filesuffix;
-        emit this->downloadedjson(m_downloadtype,m_url,m_filename,dlindex,jsonObject);
-        if(downloadtype()=="picturelist"){dlindex=dlindex+1;XHR::getlist();}
-    }
-    else  {
-        QFile file(m_filename);
-        file.open(QIODevice::WriteOnly);
-        file.write(buffer);
-        buffer.clear();
-        file.close();
-        emit this->downloaded(m_downloadtype,m_url,m_filename,dlindex);
-        if(downloadtype()=="contactlist"){dlindex=dlindex+1;XHR::getlist();}
-
-    //reply->deleteLater();
-    }
-}
-
-void XHR::onReadyRead()
-{
-    qDebug() << ".";
-    buffer += reply->readAll();
-}
-
-//void XHR::updateDownloadProgress(qint64 bytesRead, qint64 totalBytes)
-//{
-//    qDebug() << "Bytes: " << bytesRead<<" / "<<totalBytes;
-    
-//}
-
-void XHR::onSSLError(const QList<QSslError> &errors)
-{
-    qDebug() << "XHR::onSSLError :" ;
-    QListIterator<QSslError> ierrs(errors);
-    while(ierrs.hasNext()) {
-        qDebug() << "\t" <<  ierrs.next().errorString();
-    }
-}
-
-QString XHR::bufferToString()
-{
-    return QTextCodec::codecForName("utf-8")->toUnicode(buffer);
-}
diff --git a/source-android/common/xhr.cpp b/source-android/common/xhr.cpp
new file mode 120000
index 0000000..660c2c7
--- /dev/null
+++ b/source-android/common/xhr.cpp
@@ -0,0 +1 @@
+../../source-linux/common/xhr.cpp
\ No newline at end of file
diff --git a/source-android/common/xhr.h b/source-android/common/xhr.h
deleted file mode 100644
index 9141a84..0000000
--- a/source-android/common/xhr.h
+++ /dev/null
@@ -1,134 +0,0 @@
-//  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef XHR_H
-#define XHR_H
-
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QNetworkRequest>
-#include <QObject>
-#include <QJsonObject>
-#include <QNetworkConfiguration>
-
-class XHR : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString url READ url WRITE setUrl NOTIFY urlChanged)
-    Q_PROPERTY(QString login READ login WRITE setLogin NOTIFY loginChanged)
-    Q_PROPERTY(QString filename READ filename WRITE setFilename NOTIFY filenameChanged)
-    Q_PROPERTY(QString imagedir READ imagedir WRITE setImagedir NOTIFY imagedirChanged)
-    Q_PROPERTY(QList<QString> contactlist READ contactlist WRITE setContactlist NOTIFY contactlistChanged)
-    Q_PROPERTY(QList<QString> filelist READ filelist WRITE setFilelist NOTIFY filelistChanged)
-    Q_PROPERTY(QString downloadtype READ downloadtype WRITE setDownloadtype NOTIFY downloadtypeChanged)
-    Q_PROPERTY(QString networktype READ networktype() NOTIFY networktypeChanged)
-
-
-public:
-    static XHR *instance();
-
-    explicit XHR(QObject *parent = 0);
-  
-    QString url() const;
-    QString api() const;
-    QString login() const;
-    QString filename() const;
-    QList<QString> contactlist() const;
-    QList<QString> filelist() const;
-    QString imagedir() const;
-    QString downloadtype() const;
-    QString networktype();
-
-signals:
-    void urlChanged();
-    void apiChanged();
-    void loginChanged();
-    void filenameChanged();
-    void contactlistChanged();
-    void filelistChanged();
-    void imagedirChanged();
-    void downloadtypeChanged();
-    void networktypeChanged();
-    void downloaded(QString type, QString url, QString filename, int i);
-    void downloadedjson(QString type, QString url, QString filename, int i,QJsonObject jsonObject);
-    void success(QByteArray data, QString api);
-    void error(QString data, QString url,QString api, int code);
-
-public slots:
-    void setUrl(QString url);
-    void setApi(QString api);
-    void setLogin(QString login);
-    void setDownloadtype(QString downloadtype);
-    void setFilename(QString filename);
-    void setContactlist(QList<QString> filename);
-    void setFilelist(QList<QString> filename);
-    void setImagedir(QString filename);
-    void setParam(QString name, QString value);
-    void setImageFileParam(QString name, QString url);
-    void clearParams();
-    void post();
-    void get();
-    void getlist();
-    void download();
-
-//    void networktype();
-
-private slots:
-    void onReplyError(QNetworkReply::NetworkError code);
-    void onReplySuccess();
-    void onRequestFinished();
-    void onReadyRead();
-    void onSSLError(const QList<QSslError> &errors);
-    //void updateDownloadProgress(qint64 bytesRead, qint64 totalBytes);
-
-private:
-    QByteArray buffer;
-    QString m_url;
-    QString m_api;
-    QString m_login;
-    QString m_filename;
-    QString m_downloadtype;
-    QString m_networktype;
-    QHash<QString, QString> params;
-    QHash<QString, QString> files;
-    QList<QString> m_filelist;
-    QList<QString> m_contactlist;
-    QString m_imagedir;
-    int dlindex;
-
-    QNetworkAccessManager manager;
-    QNetworkRequest request;
-    QNetworkReply *reply;
-    QNetworkConfiguration nc;
-    QString bufferToString();
-};
-
-#endif // XHR_H
diff --git a/source-android/common/xhr.h b/source-android/common/xhr.h
new file mode 120000
index 0000000..d383456
--- /dev/null
+++ b/source-android/common/xhr.h
@@ -0,0 +1 @@
+../../source-linux/common/xhr.h
\ No newline at end of file
diff --git a/source-android/friendiqa.pro b/source-android/friendiqa.pro
index 5d84450..e28a85e 100644
--- a/source-android/friendiqa.pro
+++ b/source-android/friendiqa.pro
@@ -13,7 +13,7 @@
 TEMPLATE = app
 TARGET = friendiqa
 CONFIG += release
-QT += qml quick gui widgets androidextras sql webview
+QT += qml quick gui widgets androidextras sql webview #webengine
 
 include(androidnative.pri/androidnative.pri)
 
@@ -74,6 +74,6 @@ DISTFILES += \
 
 contains(ANDROID_TARGET_ARCH,armeabi-v7a) {
     ANDROID_EXTRA_LIBS = \
-        $$PWD/android/libcrypto.so \
-        $$PWD/android/libssl.so
+    $$PWD/android/libcrypto_1_1.so \
+    $$PWD/android/libssl_1_1.so
 }
diff --git a/source-android/images b/source-android/images
new file mode 120000
index 0000000..6de3f1b
--- /dev/null
+++ b/source-android/images
@@ -0,0 +1 @@
+./../source-linux/images/
\ No newline at end of file
diff --git a/source-android/images/addImage.png b/source-android/images/addImage.png
deleted file mode 100644
index 988f9f1..0000000
Binary files a/source-android/images/addImage.png and /dev/null differ
diff --git a/source-android/images/defaultcontact.jpg b/source-android/images/defaultcontact.jpg
deleted file mode 100644
index bb7bce2..0000000
Binary files a/source-android/images/defaultcontact.jpg and /dev/null differ
diff --git a/source-android/images/folder-blue.png b/source-android/images/folder-blue.png
deleted file mode 100644
index b530009..0000000
Binary files a/source-android/images/folder-blue.png and /dev/null differ
diff --git a/source-android/images/fontawesome-webfont.ttf b/source-android/images/fontawesome-webfont.ttf
deleted file mode 100644
index 35acda2..0000000
Binary files a/source-android/images/fontawesome-webfont.ttf and /dev/null differ
diff --git a/source-android/images/smileys/adult/bong.gif b/source-android/images/smileys/adult/bong.gif
deleted file mode 100644
index 4b67122..0000000
Binary files a/source-android/images/smileys/adult/bong.gif and /dev/null differ
diff --git a/source-android/images/smileys/adult/drunk.gif b/source-android/images/smileys/adult/drunk.gif
deleted file mode 100644
index 4a1c064..0000000
Binary files a/source-android/images/smileys/adult/drunk.gif and /dev/null differ
diff --git a/source-android/images/smileys/adult/finger.gif b/source-android/images/smileys/adult/finger.gif
deleted file mode 100644
index d45dcb8..0000000
Binary files a/source-android/images/smileys/adult/finger.gif and /dev/null differ
diff --git a/source-android/images/smileys/adult/sperm.gif b/source-android/images/smileys/adult/sperm.gif
deleted file mode 100644
index 6ba9219..0000000
Binary files a/source-android/images/smileys/adult/sperm.gif and /dev/null differ
diff --git a/source-android/images/smileys/adult/tits.gif b/source-android/images/smileys/adult/tits.gif
deleted file mode 100644
index 4c1658c..0000000
Binary files a/source-android/images/smileys/adult/tits.gif and /dev/null differ
diff --git a/source-android/images/smileys/animals/bee.gif b/source-android/images/smileys/animals/bee.gif
deleted file mode 100644
index 206c2e3..0000000
Binary files a/source-android/images/smileys/animals/bee.gif and /dev/null differ
diff --git a/source-android/images/smileys/animals/bigspider.gif b/source-android/images/smileys/animals/bigspider.gif
deleted file mode 100644
index bc43deb..0000000
Binary files a/source-android/images/smileys/animals/bigspider.gif and /dev/null differ
diff --git a/source-android/images/smileys/animals/bunny.gif b/source-android/images/smileys/animals/bunny.gif
deleted file mode 100644
index 402b2b3..0000000
Binary files a/source-android/images/smileys/animals/bunny.gif and /dev/null differ
diff --git a/source-android/images/smileys/animals/bunnyflowers.gif b/source-android/images/smileys/animals/bunnyflowers.gif
deleted file mode 100644
index 6d665e2..0000000
Binary files a/source-android/images/smileys/animals/bunnyflowers.gif and /dev/null differ
diff --git a/source-android/images/smileys/animals/cat.gif b/source-android/images/smileys/animals/cat.gif
deleted file mode 100644
index a612c47..0000000
Binary files a/source-android/images/smileys/animals/cat.gif and /dev/null differ
diff --git a/source-android/images/smileys/animals/chick.gif b/source-android/images/smileys/animals/chick.gif
deleted file mode 100644
index 6bcddcd..0000000
Binary files a/source-android/images/smileys/animals/chick.gif and /dev/null differ
diff --git a/source-android/images/smileys/animals/cow.gif b/source-android/images/smileys/animals/cow.gif
deleted file mode 100644
index 3f94cfa..0000000
Binary files a/source-android/images/smileys/animals/cow.gif and /dev/null differ
diff --git a/source-android/images/smileys/animals/crab.gif b/source-android/images/smileys/animals/crab.gif
deleted file mode 100644
index db5b8ce..0000000
Binary files a/source-android/images/smileys/animals/crab.gif and /dev/null differ
diff --git a/source-android/images/smileys/animals/dog.gif b/source-android/images/smileys/animals/dog.gif
deleted file mode 100644
index 7b28477..0000000
Binary files a/source-android/images/smileys/animals/dog.gif and /dev/null differ
diff --git a/source-android/images/smileys/animals/dolphin.gif b/source-android/images/smileys/animals/dolphin.gif
deleted file mode 100644
index 672ebd7..0000000
Binary files a/source-android/images/smileys/animals/dolphin.gif and /dev/null differ
diff --git a/source-android/images/smileys/animals/dragonfly.gif b/source-android/images/smileys/animals/dragonfly.gif
deleted file mode 100644
index 566e95c..0000000
Binary files a/source-android/images/smileys/animals/dragonfly.gif and /dev/null differ
diff --git a/source-android/images/smileys/animals/elephant.gif b/source-android/images/smileys/animals/elephant.gif
deleted file mode 100644
index 4311e97..0000000
Binary files a/source-android/images/smileys/animals/elephant.gif and /dev/null differ
diff --git a/source-android/images/smileys/animals/fish.gif b/source-android/images/smileys/animals/fish.gif
deleted file mode 100644
index 3a7a584..0000000
Binary files a/source-android/images/smileys/animals/fish.gif and /dev/null differ
diff --git a/source-android/images/smileys/animals/frog.gif b/source-android/images/smileys/animals/frog.gif
deleted file mode 100644
index 85e4b56..0000000
Binary files a/source-android/images/smileys/animals/frog.gif and /dev/null differ
diff --git a/source-android/images/smileys/animals/giraffe.gif b/source-android/images/smileys/animals/giraffe.gif
deleted file mode 100644
index 4c95ea4..0000000
Binary files a/source-android/images/smileys/animals/giraffe.gif and /dev/null differ
diff --git a/source-android/images/smileys/animals/hamster.gif b/source-android/images/smileys/animals/hamster.gif
deleted file mode 100644
index 96c7323..0000000
Binary files a/source-android/images/smileys/animals/hamster.gif and /dev/null differ
diff --git a/source-android/images/smileys/animals/horse.gif b/source-android/images/smileys/animals/horse.gif
deleted file mode 100644
index 9103abf..0000000
Binary files a/source-android/images/smileys/animals/horse.gif and /dev/null differ
diff --git a/source-android/images/smileys/animals/ladybird.gif b/source-android/images/smileys/animals/ladybird.gif
deleted file mode 100644
index 69444a9..0000000
Binary files a/source-android/images/smileys/animals/ladybird.gif and /dev/null differ
diff --git a/source-android/images/smileys/animals/monkey.gif b/source-android/images/smileys/animals/monkey.gif
deleted file mode 100644
index b9b338d..0000000
Binary files a/source-android/images/smileys/animals/monkey.gif and /dev/null differ
diff --git a/source-android/images/smileys/animals/parrot.gif b/source-android/images/smileys/animals/parrot.gif
deleted file mode 100644
index ae6faf6..0000000
Binary files a/source-android/images/smileys/animals/parrot.gif and /dev/null differ
diff --git a/source-android/images/smileys/animals/pig.gif b/source-android/images/smileys/animals/pig.gif
deleted file mode 100644
index bdc68e8..0000000
Binary files a/source-android/images/smileys/animals/pig.gif and /dev/null differ
diff --git a/source-android/images/smileys/animals/sheep.gif b/source-android/images/smileys/animals/sheep.gif
deleted file mode 100644
index 8fafc11..0000000
Binary files a/source-android/images/smileys/animals/sheep.gif and /dev/null differ
diff --git a/source-android/images/smileys/animals/snail.gif b/source-android/images/smileys/animals/snail.gif
deleted file mode 100644
index 3bdb44c..0000000
Binary files a/source-android/images/smileys/animals/snail.gif and /dev/null differ
diff --git a/source-android/images/smileys/animals/tux.gif b/source-android/images/smileys/animals/tux.gif
deleted file mode 100644
index 08e006e..0000000
Binary files a/source-android/images/smileys/animals/tux.gif and /dev/null differ
diff --git a/source-android/images/smileys/babies/baby.gif b/source-android/images/smileys/babies/baby.gif
deleted file mode 100644
index d105afb..0000000
Binary files a/source-android/images/smileys/babies/baby.gif and /dev/null differ
diff --git a/source-android/images/smileys/babies/babycot.gif b/source-android/images/smileys/babies/babycot.gif
deleted file mode 100644
index 750f6df..0000000
Binary files a/source-android/images/smileys/babies/babycot.gif and /dev/null differ
diff --git a/source-android/images/smileys/babies/pregnant.gif b/source-android/images/smileys/babies/pregnant.gif
deleted file mode 100644
index d97f476..0000000
Binary files a/source-android/images/smileys/babies/pregnant.gif and /dev/null differ
diff --git a/source-android/images/smileys/babies/stork.gif b/source-android/images/smileys/babies/stork.gif
deleted file mode 100644
index de2371d..0000000
Binary files a/source-android/images/smileys/babies/stork.gif and /dev/null differ
diff --git a/source-android/images/smileys/confused/confused.gif b/source-android/images/smileys/confused/confused.gif
deleted file mode 100644
index 8f1b79a..0000000
Binary files a/source-android/images/smileys/confused/confused.gif and /dev/null differ
diff --git a/source-android/images/smileys/confused/dazed.gif b/source-android/images/smileys/confused/dazed.gif
deleted file mode 100644
index f5e7ec2..0000000
Binary files a/source-android/images/smileys/confused/dazed.gif and /dev/null differ
diff --git a/source-android/images/smileys/confused/shrug.gif b/source-android/images/smileys/confused/shrug.gif
deleted file mode 100644
index 31ce007..0000000
Binary files a/source-android/images/smileys/confused/shrug.gif and /dev/null differ
diff --git a/source-android/images/smileys/confused/stupid.gif b/source-android/images/smileys/confused/stupid.gif
deleted file mode 100644
index c17170a..0000000
Binary files a/source-android/images/smileys/confused/stupid.gif and /dev/null differ
diff --git a/source-android/images/smileys/cool/affro.gif b/source-android/images/smileys/cool/affro.gif
deleted file mode 100644
index f06166b..0000000
Binary files a/source-android/images/smileys/cool/affro.gif and /dev/null differ
diff --git a/source-android/images/smileys/cool/cool.gif b/source-android/images/smileys/cool/cool.gif
deleted file mode 100644
index 05ba9f1..0000000
Binary files a/source-android/images/smileys/cool/cool.gif and /dev/null differ
diff --git a/source-android/images/smileys/core/beer_mug.gif b/source-android/images/smileys/core/beer_mug.gif
deleted file mode 100644
index 9a3e051..0000000
Binary files a/source-android/images/smileys/core/beer_mug.gif and /dev/null differ
diff --git a/source-android/images/smileys/core/coffee.gif b/source-android/images/smileys/core/coffee.gif
deleted file mode 100644
index 7e20371..0000000
Binary files a/source-android/images/smileys/core/coffee.gif and /dev/null differ
diff --git a/source-android/images/smileys/core/dislike.gif b/source-android/images/smileys/core/dislike.gif
deleted file mode 100644
index 7777942..0000000
Binary files a/source-android/images/smileys/core/dislike.gif and /dev/null differ
diff --git a/source-android/images/smileys/core/friendica-16.png b/source-android/images/smileys/core/friendica-16.png
deleted file mode 100644
index 745b7ac..0000000
Binary files a/source-android/images/smileys/core/friendica-16.png and /dev/null differ
diff --git a/source-android/images/smileys/core/like.gif b/source-android/images/smileys/core/like.gif
deleted file mode 100644
index f71d032..0000000
Binary files a/source-android/images/smileys/core/like.gif and /dev/null differ
diff --git a/source-android/images/smileys/core/rm-16.png b/source-android/images/smileys/core/rm-16.png
deleted file mode 100644
index 9361ef2..0000000
Binary files a/source-android/images/smileys/core/rm-16.png and /dev/null differ
diff --git a/source-android/images/smileys/core/smiley-Oo.gif b/source-android/images/smileys/core/smiley-Oo.gif
deleted file mode 100644
index a15d974..0000000
Binary files a/source-android/images/smileys/core/smiley-Oo.gif and /dev/null differ
diff --git a/source-android/images/smileys/core/smiley-bangheaddesk.gif b/source-android/images/smileys/core/smiley-bangheaddesk.gif
deleted file mode 100644
index 91ccb8b..0000000
Binary files a/source-android/images/smileys/core/smiley-bangheaddesk.gif and /dev/null differ
diff --git a/source-android/images/smileys/core/smiley-brokenheart.gif b/source-android/images/smileys/core/smiley-brokenheart.gif
deleted file mode 100644
index 971b57f..0000000
Binary files a/source-android/images/smileys/core/smiley-brokenheart.gif and /dev/null differ
diff --git a/source-android/images/smileys/core/smiley-cool.gif b/source-android/images/smileys/core/smiley-cool.gif
deleted file mode 100644
index cee1c1a..0000000
Binary files a/source-android/images/smileys/core/smiley-cool.gif and /dev/null differ
diff --git a/source-android/images/smileys/core/smiley-cry.gif b/source-android/images/smileys/core/smiley-cry.gif
deleted file mode 100644
index 06e6ca2..0000000
Binary files a/source-android/images/smileys/core/smiley-cry.gif and /dev/null differ
diff --git a/source-android/images/smileys/core/smiley-embarassed.gif b/source-android/images/smileys/core/smiley-embarassed.gif
deleted file mode 100644
index adc12e7..0000000
Binary files a/source-android/images/smileys/core/smiley-embarassed.gif and /dev/null differ
diff --git a/source-android/images/smileys/core/smiley-facepalm.gif b/source-android/images/smileys/core/smiley-facepalm.gif
deleted file mode 100644
index 7243703..0000000
Binary files a/source-android/images/smileys/core/smiley-facepalm.gif and /dev/null differ
diff --git a/source-android/images/smileys/core/smiley-foot-in-mouth.gif b/source-android/images/smileys/core/smiley-foot-in-mouth.gif
deleted file mode 100644
index b444e57..0000000
Binary files a/source-android/images/smileys/core/smiley-foot-in-mouth.gif and /dev/null differ
diff --git a/source-android/images/smileys/core/smiley-frown.gif b/source-android/images/smileys/core/smiley-frown.gif
deleted file mode 100644
index 9ff1985..0000000
Binary files a/source-android/images/smileys/core/smiley-frown.gif and /dev/null differ
diff --git a/source-android/images/smileys/core/smiley-heart.gif b/source-android/images/smileys/core/smiley-heart.gif
deleted file mode 100644
index 6a11e70..0000000
Binary files a/source-android/images/smileys/core/smiley-heart.gif and /dev/null differ
diff --git a/source-android/images/smileys/core/smiley-kiss.gif b/source-android/images/smileys/core/smiley-kiss.gif
deleted file mode 100644
index cc35661..0000000
Binary files a/source-android/images/smileys/core/smiley-kiss.gif and /dev/null differ
diff --git a/source-android/images/smileys/core/smiley-laughing.gif b/source-android/images/smileys/core/smiley-laughing.gif
deleted file mode 100644
index 1bf29de..0000000
Binary files a/source-android/images/smileys/core/smiley-laughing.gif and /dev/null differ
diff --git a/source-android/images/smileys/core/smiley-smile.gif b/source-android/images/smileys/core/smiley-smile.gif
deleted file mode 100644
index b9bff40..0000000
Binary files a/source-android/images/smileys/core/smiley-smile.gif and /dev/null differ
diff --git a/source-android/images/smileys/core/smiley-surprised.gif b/source-android/images/smileys/core/smiley-surprised.gif
deleted file mode 100644
index b074653..0000000
Binary files a/source-android/images/smileys/core/smiley-surprised.gif and /dev/null differ
diff --git a/source-android/images/smileys/core/smiley-thumbsup.gif b/source-android/images/smileys/core/smiley-thumbsup.gif
deleted file mode 100644
index 1bc6b12..0000000
Binary files a/source-android/images/smileys/core/smiley-thumbsup.gif and /dev/null differ
diff --git a/source-android/images/smileys/core/smiley-tongue-out.gif b/source-android/images/smileys/core/smiley-tongue-out.gif
deleted file mode 100644
index 48867dc..0000000
Binary files a/source-android/images/smileys/core/smiley-tongue-out.gif and /dev/null differ
diff --git a/source-android/images/smileys/core/smiley-undecided.gif b/source-android/images/smileys/core/smiley-undecided.gif
deleted file mode 100644
index 2802979..0000000
Binary files a/source-android/images/smileys/core/smiley-undecided.gif and /dev/null differ
diff --git a/source-android/images/smileys/core/smiley-wink.gif b/source-android/images/smileys/core/smiley-wink.gif
deleted file mode 100644
index e1cefb0..0000000
Binary files a/source-android/images/smileys/core/smiley-wink.gif and /dev/null differ
diff --git a/source-android/images/smileys/devilangel/angel.gif b/source-android/images/smileys/devilangel/angel.gif
deleted file mode 100644
index 8e58541..0000000
Binary files a/source-android/images/smileys/devilangel/angel.gif and /dev/null differ
diff --git a/source-android/images/smileys/devilangel/blondedevil.gif b/source-android/images/smileys/devilangel/blondedevil.gif
deleted file mode 100644
index 09e7e68..0000000
Binary files a/source-android/images/smileys/devilangel/blondedevil.gif and /dev/null differ
diff --git a/source-android/images/smileys/devilangel/catdevil.gif b/source-android/images/smileys/devilangel/catdevil.gif
deleted file mode 100644
index 269d719..0000000
Binary files a/source-android/images/smileys/devilangel/catdevil.gif and /dev/null differ
diff --git a/source-android/images/smileys/devilangel/cherub.gif b/source-android/images/smileys/devilangel/cherub.gif
deleted file mode 100644
index 40872e0..0000000
Binary files a/source-android/images/smileys/devilangel/cherub.gif and /dev/null differ
diff --git a/source-android/images/smileys/devilangel/daseesaw.gif b/source-android/images/smileys/devilangel/daseesaw.gif
deleted file mode 100644
index 1c04b2e..0000000
Binary files a/source-android/images/smileys/devilangel/daseesaw.gif and /dev/null differ
diff --git a/source-android/images/smileys/devilangel/devil.gif b/source-android/images/smileys/devilangel/devil.gif
deleted file mode 100644
index 2b56797..0000000
Binary files a/source-android/images/smileys/devilangel/devil.gif and /dev/null differ
diff --git a/source-android/images/smileys/devilangel/graveside.gif b/source-android/images/smileys/devilangel/graveside.gif
deleted file mode 100644
index 0e90935..0000000
Binary files a/source-android/images/smileys/devilangel/graveside.gif and /dev/null differ
diff --git a/source-android/images/smileys/devilangel/saint.gif b/source-android/images/smileys/devilangel/saint.gif
deleted file mode 100644
index 52c22c4..0000000
Binary files a/source-android/images/smileys/devilangel/saint.gif and /dev/null differ
diff --git a/source-android/images/smileys/devilangel/turnevil.gif b/source-android/images/smileys/devilangel/turnevil.gif
deleted file mode 100644
index 1490c0f..0000000
Binary files a/source-android/images/smileys/devilangel/turnevil.gif and /dev/null differ
diff --git a/source-android/images/smileys/disgust/fartblush.gif b/source-android/images/smileys/disgust/fartblush.gif
deleted file mode 100644
index 4160a1f..0000000
Binary files a/source-android/images/smileys/disgust/fartblush.gif and /dev/null differ
diff --git a/source-android/images/smileys/disgust/fartinbed.gif b/source-android/images/smileys/disgust/fartinbed.gif
deleted file mode 100644
index 5553649..0000000
Binary files a/source-android/images/smileys/disgust/fartinbed.gif and /dev/null differ
diff --git a/source-android/images/smileys/disgust/toilet.gif b/source-android/images/smileys/disgust/toilet.gif
deleted file mode 100644
index 092d7ca..0000000
Binary files a/source-android/images/smileys/disgust/toilet.gif and /dev/null differ
diff --git a/source-android/images/smileys/disgust/vomit.gif b/source-android/images/smileys/disgust/vomit.gif
deleted file mode 100644
index 6e7e727..0000000
Binary files a/source-android/images/smileys/disgust/vomit.gif and /dev/null differ
diff --git a/source-android/images/smileys/drink/tea.gif b/source-android/images/smileys/drink/tea.gif
deleted file mode 100644
index 474b989..0000000
Binary files a/source-android/images/smileys/drink/tea.gif and /dev/null differ
diff --git a/source-android/images/smileys/drool/drool.gif b/source-android/images/smileys/drool/drool.gif
deleted file mode 100644
index 4093df6..0000000
Binary files a/source-android/images/smileys/drool/drool.gif and /dev/null differ
diff --git a/source-android/images/smileys/fantasy/alienmonster.gif b/source-android/images/smileys/fantasy/alienmonster.gif
deleted file mode 100644
index e0ca7f6..0000000
Binary files a/source-android/images/smileys/fantasy/alienmonster.gif and /dev/null differ
diff --git a/source-android/images/smileys/fantasy/barbarian.gif b/source-android/images/smileys/fantasy/barbarian.gif
deleted file mode 100644
index de8a068..0000000
Binary files a/source-android/images/smileys/fantasy/barbarian.gif and /dev/null differ
diff --git a/source-android/images/smileys/fantasy/dinosaur.gif b/source-android/images/smileys/fantasy/dinosaur.gif
deleted file mode 100644
index e8c625c..0000000
Binary files a/source-android/images/smileys/fantasy/dinosaur.gif and /dev/null differ
diff --git a/source-android/images/smileys/fantasy/dragon.gif b/source-android/images/smileys/fantasy/dragon.gif
deleted file mode 100644
index fd28fbf..0000000
Binary files a/source-android/images/smileys/fantasy/dragon.gif and /dev/null differ
diff --git a/source-android/images/smileys/fantasy/dragonwhelp.gif b/source-android/images/smileys/fantasy/dragonwhelp.gif
deleted file mode 100644
index dbc4555..0000000
Binary files a/source-android/images/smileys/fantasy/dragonwhelp.gif and /dev/null differ
diff --git a/source-android/images/smileys/fantasy/ghost.gif b/source-android/images/smileys/fantasy/ghost.gif
deleted file mode 100644
index 4c5d85d..0000000
Binary files a/source-android/images/smileys/fantasy/ghost.gif and /dev/null differ
diff --git a/source-android/images/smileys/fantasy/mummy.gif b/source-android/images/smileys/fantasy/mummy.gif
deleted file mode 100644
index 50e1dfb..0000000
Binary files a/source-android/images/smileys/fantasy/mummy.gif and /dev/null differ
diff --git a/source-android/images/smileys/fight/2guns.gif b/source-android/images/smileys/fight/2guns.gif
deleted file mode 100644
index 9e1b663..0000000
Binary files a/source-android/images/smileys/fight/2guns.gif and /dev/null differ
diff --git a/source-android/images/smileys/fight/acid.gif b/source-android/images/smileys/fight/acid.gif
deleted file mode 100644
index fa55f67..0000000
Binary files a/source-android/images/smileys/fight/acid.gif and /dev/null differ
diff --git a/source-android/images/smileys/fight/alienfight.gif b/source-android/images/smileys/fight/alienfight.gif
deleted file mode 100644
index 9d5e879..0000000
Binary files a/source-android/images/smileys/fight/alienfight.gif and /dev/null differ
diff --git a/source-android/images/smileys/fight/alpha.png b/source-android/images/smileys/fight/alpha.png
deleted file mode 100644
index 09e3f23..0000000
Binary files a/source-android/images/smileys/fight/alpha.png and /dev/null differ
diff --git a/source-android/images/smileys/fight/army.gif b/source-android/images/smileys/fight/army.gif
deleted file mode 100644
index 7506700..0000000
Binary files a/source-android/images/smileys/fight/army.gif and /dev/null differ
diff --git a/source-android/images/smileys/fight/arrowhead.gif b/source-android/images/smileys/fight/arrowhead.gif
deleted file mode 100644
index f4572c4..0000000
Binary files a/source-android/images/smileys/fight/arrowhead.gif and /dev/null differ
diff --git a/source-android/images/smileys/fight/bfg.gif b/source-android/images/smileys/fight/bfg.gif
deleted file mode 100644
index c2ba9d0..0000000
Binary files a/source-android/images/smileys/fight/bfg.gif and /dev/null differ
diff --git a/source-android/images/smileys/fight/bowman.gif b/source-android/images/smileys/fight/bowman.gif
deleted file mode 100644
index 2f1f8f0..0000000
Binary files a/source-android/images/smileys/fight/bowman.gif and /dev/null differ
diff --git a/source-android/images/smileys/fight/chainsaw.gif b/source-android/images/smileys/fight/chainsaw.gif
deleted file mode 100644
index 71f757c..0000000
Binary files a/source-android/images/smileys/fight/chainsaw.gif and /dev/null differ
diff --git a/source-android/images/smileys/fight/crossbow.gif b/source-android/images/smileys/fight/crossbow.gif
deleted file mode 100644
index 20874f3..0000000
Binary files a/source-android/images/smileys/fight/crossbow.gif and /dev/null differ
diff --git a/source-android/images/smileys/fight/crusader.gif b/source-android/images/smileys/fight/crusader.gif
deleted file mode 100644
index 95848ae..0000000
Binary files a/source-android/images/smileys/fight/crusader.gif and /dev/null differ
diff --git a/source-android/images/smileys/fight/dead.gif b/source-android/images/smileys/fight/dead.gif
deleted file mode 100644
index 31adaba..0000000
Binary files a/source-android/images/smileys/fight/dead.gif and /dev/null differ
diff --git a/source-android/images/smileys/fight/gangs.gif b/source-android/images/smileys/fight/gangs.gif
deleted file mode 100644
index 2c655b1..0000000
Binary files a/source-android/images/smileys/fight/gangs.gif and /dev/null differ
diff --git a/source-android/images/smileys/fight/hammersplat.gif b/source-android/images/smileys/fight/hammersplat.gif
deleted file mode 100644
index 95bd540..0000000
Binary files a/source-android/images/smileys/fight/hammersplat.gif and /dev/null differ
diff --git a/source-android/images/smileys/fight/lasergun.gif b/source-android/images/smileys/fight/lasergun.gif
deleted file mode 100644
index f3f82cb..0000000
Binary files a/source-android/images/smileys/fight/lasergun.gif and /dev/null differ
diff --git a/source-android/images/smileys/fight/machinegun.gif b/source-android/images/smileys/fight/machinegun.gif
deleted file mode 100644
index 1cff5cc..0000000
Binary files a/source-android/images/smileys/fight/machinegun.gif and /dev/null differ
diff --git a/source-android/images/smileys/fight/marine.gif b/source-android/images/smileys/fight/marine.gif
deleted file mode 100644
index 88fd2e0..0000000
Binary files a/source-android/images/smileys/fight/marine.gif and /dev/null differ
diff --git a/source-android/images/smileys/fight/sabre.gif b/source-android/images/smileys/fight/sabre.gif
deleted file mode 100644
index e623968..0000000
Binary files a/source-android/images/smileys/fight/sabre.gif and /dev/null differ
diff --git a/source-android/images/smileys/fight/samurai.gif b/source-android/images/smileys/fight/samurai.gif
deleted file mode 100644
index 8b24385..0000000
Binary files a/source-android/images/smileys/fight/samurai.gif and /dev/null differ
diff --git a/source-android/images/smileys/fight/tank.gif b/source-android/images/smileys/fight/tank.gif
deleted file mode 100644
index f1d969d..0000000
Binary files a/source-android/images/smileys/fight/tank.gif and /dev/null differ
diff --git a/source-android/images/smileys/fight/viking.gif b/source-android/images/smileys/fight/viking.gif
deleted file mode 100644
index 4908edd..0000000
Binary files a/source-android/images/smileys/fight/viking.gif and /dev/null differ
diff --git a/source-android/images/smileys/food/apple.gif b/source-android/images/smileys/food/apple.gif
deleted file mode 100644
index 969d4ca..0000000
Binary files a/source-android/images/smileys/food/apple.gif and /dev/null differ
diff --git a/source-android/images/smileys/food/banana.gif b/source-android/images/smileys/food/banana.gif
deleted file mode 100644
index d990d19..0000000
Binary files a/source-android/images/smileys/food/banana.gif and /dev/null differ
diff --git a/source-android/images/smileys/food/birthdaycake.gif b/source-android/images/smileys/food/birthdaycake.gif
deleted file mode 100644
index 30ebceb..0000000
Binary files a/source-android/images/smileys/food/birthdaycake.gif and /dev/null differ
diff --git a/source-android/images/smileys/food/broccoli.gif b/source-android/images/smileys/food/broccoli.gif
deleted file mode 100644
index f379889..0000000
Binary files a/source-android/images/smileys/food/broccoli.gif and /dev/null differ
diff --git a/source-android/images/smileys/food/cake.gif b/source-android/images/smileys/food/cake.gif
deleted file mode 100644
index 22d0ebd..0000000
Binary files a/source-android/images/smileys/food/cake.gif and /dev/null differ
diff --git a/source-android/images/smileys/food/carrot.gif b/source-android/images/smileys/food/carrot.gif
deleted file mode 100644
index 387b94c..0000000
Binary files a/source-android/images/smileys/food/carrot.gif and /dev/null differ
diff --git a/source-android/images/smileys/food/cooking.gif b/source-android/images/smileys/food/cooking.gif
deleted file mode 100644
index e62fea0..0000000
Binary files a/source-android/images/smileys/food/cooking.gif and /dev/null differ
diff --git a/source-android/images/smileys/food/fryegg.gif b/source-android/images/smileys/food/fryegg.gif
deleted file mode 100644
index bd1b4ff..0000000
Binary files a/source-android/images/smileys/food/fryegg.gif and /dev/null differ
diff --git a/source-android/images/smileys/food/popcorn.gif b/source-android/images/smileys/food/popcorn.gif
deleted file mode 100644
index b0ea697..0000000
Binary files a/source-android/images/smileys/food/popcorn.gif and /dev/null differ
diff --git a/source-android/images/smileys/food/tomato.gif b/source-android/images/smileys/food/tomato.gif
deleted file mode 100644
index 0e3dadd..0000000
Binary files a/source-android/images/smileys/food/tomato.gif and /dev/null differ
diff --git a/source-android/images/smileys/happy/cloud9.gif b/source-android/images/smileys/happy/cloud9.gif
deleted file mode 100644
index 801c1a3..0000000
Binary files a/source-android/images/smileys/happy/cloud9.gif and /dev/null differ
diff --git a/source-android/images/smileys/happy/tearsofjoy.gif b/source-android/images/smileys/happy/tearsofjoy.gif
deleted file mode 100644
index 5de3117..0000000
Binary files a/source-android/images/smileys/happy/tearsofjoy.gif and /dev/null differ
diff --git a/source-android/images/smileys/laugh/hahaha.gif b/source-android/images/smileys/laugh/hahaha.gif
deleted file mode 100644
index 37aa92a..0000000
Binary files a/source-android/images/smileys/laugh/hahaha.gif and /dev/null differ
diff --git a/source-android/images/smileys/laugh/loltv.gif b/source-android/images/smileys/laugh/loltv.gif
deleted file mode 100644
index 3de6f77..0000000
Binary files a/source-android/images/smileys/laugh/loltv.gif and /dev/null differ
diff --git a/source-android/images/smileys/laugh/rofl.gif b/source-android/images/smileys/laugh/rofl.gif
deleted file mode 100644
index a3bb03d..0000000
Binary files a/source-android/images/smileys/laugh/rofl.gif and /dev/null differ
diff --git a/source-android/images/smileys/love/iloveyou.gif b/source-android/images/smileys/love/iloveyou.gif
deleted file mode 100644
index 7007515..0000000
Binary files a/source-android/images/smileys/love/iloveyou.gif and /dev/null differ
diff --git a/source-android/images/smileys/love/inlove.gif b/source-android/images/smileys/love/inlove.gif
deleted file mode 100644
index 30357af..0000000
Binary files a/source-android/images/smileys/love/inlove.gif and /dev/null differ
diff --git a/source-android/images/smileys/love/love.gif b/source-android/images/smileys/love/love.gif
deleted file mode 100644
index d8f0d5b..0000000
Binary files a/source-android/images/smileys/love/love.gif and /dev/null differ
diff --git a/source-android/images/smileys/love/lovebear.gif b/source-android/images/smileys/love/lovebear.gif
deleted file mode 100644
index d13fd18..0000000
Binary files a/source-android/images/smileys/love/lovebear.gif and /dev/null differ
diff --git a/source-android/images/smileys/love/lovebed.gif b/source-android/images/smileys/love/lovebed.gif
deleted file mode 100644
index c5783e0..0000000
Binary files a/source-android/images/smileys/love/lovebed.gif and /dev/null differ
diff --git a/source-android/images/smileys/love/loveheart.gif b/source-android/images/smileys/love/loveheart.gif
deleted file mode 100644
index 541220a..0000000
Binary files a/source-android/images/smileys/love/loveheart.gif and /dev/null differ
diff --git a/source-android/images/smileys/music/dj.gif b/source-android/images/smileys/music/dj.gif
deleted file mode 100644
index 66bc075..0000000
Binary files a/source-android/images/smileys/music/dj.gif and /dev/null differ
diff --git a/source-android/images/smileys/music/drums.gif b/source-android/images/smileys/music/drums.gif
deleted file mode 100644
index 27215f4..0000000
Binary files a/source-android/images/smileys/music/drums.gif and /dev/null differ
diff --git a/source-android/images/smileys/music/elvis.gif b/source-android/images/smileys/music/elvis.gif
deleted file mode 100644
index ebcdccc..0000000
Binary files a/source-android/images/smileys/music/elvis.gif and /dev/null differ
diff --git a/source-android/images/smileys/music/guitar.gif b/source-android/images/smileys/music/guitar.gif
deleted file mode 100644
index 11eccdd..0000000
Binary files a/source-android/images/smileys/music/guitar.gif and /dev/null differ
diff --git a/source-android/images/smileys/music/trumpet.gif b/source-android/images/smileys/music/trumpet.gif
deleted file mode 100644
index 4595ccc..0000000
Binary files a/source-android/images/smileys/music/trumpet.gif and /dev/null differ
diff --git a/source-android/images/smileys/music/violin.gif b/source-android/images/smileys/music/violin.gif
deleted file mode 100644
index 53592d6..0000000
Binary files a/source-android/images/smileys/music/violin.gif and /dev/null differ
diff --git a/source-android/images/smileys/oldcore/beard.png b/source-android/images/smileys/oldcore/beard.png
deleted file mode 100644
index 5d4b284..0000000
Binary files a/source-android/images/smileys/oldcore/beard.png and /dev/null differ
diff --git a/source-android/images/smileys/oldcore/headbang.gif b/source-android/images/smileys/oldcore/headbang.gif
deleted file mode 100644
index 91ccb8b..0000000
Binary files a/source-android/images/smileys/oldcore/headbang.gif and /dev/null differ
diff --git a/source-android/images/smileys/oldcore/laughing.gif b/source-android/images/smileys/oldcore/laughing.gif
deleted file mode 100644
index 1bf29de..0000000
Binary files a/source-android/images/smileys/oldcore/laughing.gif and /dev/null differ
diff --git a/source-android/images/smileys/oldcore/shaka.gif b/source-android/images/smileys/oldcore/shaka.gif
deleted file mode 100644
index e5d7b70..0000000
Binary files a/source-android/images/smileys/oldcore/shaka.gif and /dev/null differ
diff --git a/source-android/images/smileys/oldcore/surprised.gif b/source-android/images/smileys/oldcore/surprised.gif
deleted file mode 100644
index b074653..0000000
Binary files a/source-android/images/smileys/oldcore/surprised.gif and /dev/null differ
diff --git a/source-android/images/smileys/oldcore/whitebeard.png b/source-android/images/smileys/oldcore/whitebeard.png
deleted file mode 100644
index 2a1fccb..0000000
Binary files a/source-android/images/smileys/oldcore/whitebeard.png and /dev/null differ
diff --git a/source-android/images/smileys/respect/bow.gif b/source-android/images/smileys/respect/bow.gif
deleted file mode 100644
index ecc6484..0000000
Binary files a/source-android/images/smileys/respect/bow.gif and /dev/null differ
diff --git a/source-android/images/smileys/respect/bravo.gif b/source-android/images/smileys/respect/bravo.gif
deleted file mode 100644
index 34f72ab..0000000
Binary files a/source-android/images/smileys/respect/bravo.gif and /dev/null differ
diff --git a/source-android/images/smileys/respect/hailking.gif b/source-android/images/smileys/respect/hailking.gif
deleted file mode 100644
index 07551e5..0000000
Binary files a/source-android/images/smileys/respect/hailking.gif and /dev/null differ
diff --git a/source-android/images/smileys/respect/number1.gif b/source-android/images/smileys/respect/number1.gif
deleted file mode 100644
index ab5c410..0000000
Binary files a/source-android/images/smileys/respect/number1.gif and /dev/null differ
diff --git a/source-android/images/smileys/sad/crying.png b/source-android/images/smileys/sad/crying.png
deleted file mode 100644
index 62b9646..0000000
Binary files a/source-android/images/smileys/sad/crying.png and /dev/null differ
diff --git a/source-android/images/smileys/sad/prisoner.gif b/source-android/images/smileys/sad/prisoner.gif
deleted file mode 100644
index f2c3181..0000000
Binary files a/source-android/images/smileys/sad/prisoner.gif and /dev/null differ
diff --git a/source-android/images/smileys/sad/sigh.gif b/source-android/images/smileys/sad/sigh.gif
deleted file mode 100644
index 6860226..0000000
Binary files a/source-android/images/smileys/sad/sigh.gif and /dev/null differ
diff --git a/source-android/images/smileys/smoking/smoking.gif b/source-android/images/smileys/smoking/smoking.gif
deleted file mode 100644
index 77720b1..0000000
Binary files a/source-android/images/smileys/smoking/smoking.gif and /dev/null differ
diff --git a/source-android/images/smileys/sport/archery.gif b/source-android/images/smileys/sport/archery.gif
deleted file mode 100644
index 8b4b9f6..0000000
Binary files a/source-android/images/smileys/sport/archery.gif and /dev/null differ
diff --git a/source-android/images/smileys/sport/basketball.gif b/source-android/images/smileys/sport/basketball.gif
deleted file mode 100644
index e9ad4b5..0000000
Binary files a/source-android/images/smileys/sport/basketball.gif and /dev/null differ
diff --git a/source-android/images/smileys/sport/bowling.gif b/source-android/images/smileys/sport/bowling.gif
deleted file mode 100644
index 0f8300c..0000000
Binary files a/source-android/images/smileys/sport/bowling.gif and /dev/null differ
diff --git a/source-android/images/smileys/sport/cycling.gif b/source-android/images/smileys/sport/cycling.gif
deleted file mode 100644
index 332081e..0000000
Binary files a/source-android/images/smileys/sport/cycling.gif and /dev/null differ
diff --git a/source-android/images/smileys/sport/darts.gif b/source-android/images/smileys/sport/darts.gif
deleted file mode 100644
index 09fb6ea..0000000
Binary files a/source-android/images/smileys/sport/darts.gif and /dev/null differ
diff --git a/source-android/images/smileys/sport/fencing.gif b/source-android/images/smileys/sport/fencing.gif
deleted file mode 100644
index a4ec5cd..0000000
Binary files a/source-android/images/smileys/sport/fencing.gif and /dev/null differ
diff --git a/source-android/images/smileys/sport/football.gif b/source-android/images/smileys/sport/football.gif
deleted file mode 100644
index c9fa6c5..0000000
Binary files a/source-android/images/smileys/sport/football.gif and /dev/null differ
diff --git a/source-android/images/smileys/sport/golf.gif b/source-android/images/smileys/sport/golf.gif
deleted file mode 100644
index 179fc52..0000000
Binary files a/source-android/images/smileys/sport/golf.gif and /dev/null differ
diff --git a/source-android/images/smileys/sport/horseriding.gif b/source-android/images/smileys/sport/horseriding.gif
deleted file mode 100644
index 13ca450..0000000
Binary files a/source-android/images/smileys/sport/horseriding.gif and /dev/null differ
diff --git a/source-android/images/smileys/sport/juggling.gif b/source-android/images/smileys/sport/juggling.gif
deleted file mode 100644
index 1a2eb60..0000000
Binary files a/source-android/images/smileys/sport/juggling.gif and /dev/null differ
diff --git a/source-android/images/smileys/sport/skipping.gif b/source-android/images/smileys/sport/skipping.gif
deleted file mode 100644
index f63270b..0000000
Binary files a/source-android/images/smileys/sport/skipping.gif and /dev/null differ
diff --git a/source-android/images/smileys/sport/snooker.gif b/source-android/images/smileys/sport/snooker.gif
deleted file mode 100644
index fa2e6a8..0000000
Binary files a/source-android/images/smileys/sport/snooker.gif and /dev/null differ
diff --git a/source-android/images/smileys/sport/surfing.gif b/source-android/images/smileys/sport/surfing.gif
deleted file mode 100644
index b75d74b..0000000
Binary files a/source-android/images/smileys/sport/surfing.gif and /dev/null differ
diff --git a/source-android/images/smileys/sport/tennis.gif b/source-android/images/smileys/sport/tennis.gif
deleted file mode 100644
index 36e47bf..0000000
Binary files a/source-android/images/smileys/sport/tennis.gif and /dev/null differ
diff --git a/source-android/images/smileys/tired/countsheep.gif b/source-android/images/smileys/tired/countsheep.gif
deleted file mode 100644
index 815b090..0000000
Binary files a/source-android/images/smileys/tired/countsheep.gif and /dev/null differ
diff --git a/source-android/images/smileys/tired/hammock.gif b/source-android/images/smileys/tired/hammock.gif
deleted file mode 100644
index 8639dd3..0000000
Binary files a/source-android/images/smileys/tired/hammock.gif and /dev/null differ
diff --git a/source-android/images/smileys/tired/pillow.gif b/source-android/images/smileys/tired/pillow.gif
deleted file mode 100644
index 367f65e..0000000
Binary files a/source-android/images/smileys/tired/pillow.gif and /dev/null differ
diff --git a/source-android/images/smileys/tired/yawn.gif b/source-android/images/smileys/tired/yawn.gif
deleted file mode 100644
index d451480..0000000
Binary files a/source-android/images/smileys/tired/yawn.gif and /dev/null differ
diff --git a/source-android/js b/source-android/js
new file mode 120000
index 0000000..2935f6c
--- /dev/null
+++ b/source-android/js
@@ -0,0 +1 @@
+./../source-linux/js/
\ No newline at end of file
diff --git a/source-android/js/friendworker.js b/source-android/js/friendworker.js
deleted file mode 100644
index 1d30709..0000000
--- a/source-android/js/friendworker.js
+++ /dev/null
@@ -1,42 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-WorkerScript.onMessage = function(msg) {
- msg.model.clear();
- for (var j=0;j<msg.albums.length;j++){
-        if (msg.albums[j]) {
-            var albumobject=msg.albums[j];
-            var data=({"albumobject": albumobject,"foreignPicture": msg.foreignPicture})}
-//        print("Albums:"+j+msg.albums.length+JSON.stringify(data));
-            msg.model.append(data);}
-             if (j==msg.albums.length){
-                 msg.model.sync()
-            };
-}
diff --git a/source-android/js/helper.js b/source-android/js/helper.js
deleted file mode 100644
index 3bcb523..0000000
--- a/source-android/js/helper.js
+++ /dev/null
@@ -1,193 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-.pragma library
-.import QtQuick.LocalStorage 2.0 as Sql
-
-function friendicaRequest(login,api,rootwindow,callback) {
-    var xhrequest= new XMLHttpRequest();
-    xhrequest.onreadystatechange = function() {
-        if(xhrequest.readyState === XMLHttpRequest.DONE) {
-            try{
-                if (xhrequest.status==200){
-                    callback(xhrequest.responseText)
-                }else{
-                    showMessage("Error","API:\n" +login.server+api+"\n NO RESPONSE"+xhrequest.statusText,rootwindow);
-                }
-            }
-            catch (e){
-                showMessage("Error",  "API:\n" +login.server+api+"\n"+e+"\n Return: "+xhrequest.responseText,rootwindow)
-            }
-         }
-    }
-    xhrequest.open("GET", login.server+api,true,login.username,Qt.atob(login.password));
-    xhrequest.send();
-}
-
-function friendicaPostRequest(login,api,data,method,rootwindow,callback) {
-    var xhrequest= new XMLHttpRequest();
-    xhrequest.onreadystatechange = function() {
-        //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!=""){
-                        callback(xhrequest.responseText)
-                        }else{
-                        showMessage("Error","API:\n" +api+" NO RESPONSE",rootwindow)
-                        callback(xhrequest.responseText)
-                        }
-                }
-                catch (e){showMessage("Error", "API:\n" + api+" "+e+"\n Return:"+xhrequest.responseText,rootwindow)}
-            }
-        }
-    xhrequest.open(method, login.server+api,true,login.username,Qt.atob(login.password));
-    xhrequest.send(data);
-}
-
-function getCount(database,login,table,field,countvalue){
-    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-    var count=0;
-    db.transaction( function(tx) {
-        var countrs = tx.executeSql('SELECT COUNT(*) from '+table+' WHERE username= "'+ login.username +'" AND '+field+' = "'+countvalue+'"');
-        count = parseInt(countrs.rows.item(0)["COUNT(*)"])
-    })
-    return count
-}
-
-function friendicaWebRequest(url,rootwindow,callback) {
-    var xhrequest = new XMLHttpRequest();
-    xhrequest.onreadystatechange = function() {
-        if (xhrequest.readyState === XMLHttpRequest.HEADERS_RECEIVED) {}
-        else if(xhrequest.readyState === XMLHttpRequest.DONE) {
-            try{callback(xhrequest.responseText)}
-            catch (e){showMessage("Error","API:\n" +url+" "+e+"\n Return: "+xhrequest.responseText, rootwindow)}
-         }
-    }
-    xhrequest.open("GET", url,true);
-    xhrequest.send();
-}
-
-function friendicaXmlRequest(url,rootwindow,callback) {
-    var xhrequest = new XMLHttpRequest();
-    xhrequest.onreadystatechange = function() {
-        if (xhrequest.readyState === XMLHttpRequest.HEADERS_RECEIVED) {}
-        else if(xhrequest.readyState === XMLHttpRequest.DONE) {
-            try{callback(xhrequest.responseXML)}
-            catch (e){showMessage("Error","API:\n" +url+" "+e+"\n Return: "+xhrequest.responseText, rootwindow)}
-         }
-    }
-    xhrequest.open("GET", url);
-    xhrequest.responseType ="document";
-    xhrequest.send();
-}
-
-function friendicaRemoteAuthRequest(login,url,c_url,rootwindow,callback) {
-    var xhrequest = new XMLHttpRequest();
-    xhrequest.onreadystatechange = function() {
-        if (xhrequest.readyState === XMLHttpRequest.HEADERS_RECEIVED) {}
-        else if(xhrequest.readyState === XMLHttpRequest.DONE) {
-            try{callback(xhrequest.responseText)}
-            catch (e){showMessage("Error","Url:\n" +url+" "+e+"\n Return: "+xhrequest.responseText, rootwindow)}
-         }
-    }
-    xhrequest.open("GET", login.server+"/api/friendica/remoteauth?c_url="+c_url+"&url="+url,true,login.username,Qt.atob(login.password));
-    xhrequest.send();
-}
-
-
-function readData(database,table,username,callback,filter,filtervalue, sort) { // reads and applies data from DB
- if (filter){
-    if (username){var where = " AND "+ filter +" = '" + filtervalue+"'";} else{
-     var where = " WHERE "+ filter +" = '" + filtervalue+"'";}
- } else { var where="";}
- if (username){
-    var user = ' where username= "'+ username +'"';
- } else { var user='';}
-
- if (sort){
- var sortparam = " ORDER BY "+ sort;
- } else { var sortparam="";}
- var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
- if(!db) { return; }
- db.transaction( function(tx) {
-     //print('select * from '+table+user+where+sortparam);
-     var rsArray=[];
-     var rs = tx.executeSql('select * from '+table+user+where+sortparam);
-     for(var i = 0; i < rs.rows.length; i++) {
-         rsArray.push(rs.rows.item(i))
-     }
-     callback(rsArray);
- });
-}
-
-function readField(field,database,table, username, callback,filter,filtervalue) { // reads and applies data from DB
-if (filter){
-var where = " AND "+ filter +" = '" + filtervalue+"'";
-} else { var where="";}
- var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-  if(!db) { return; }
- db.transaction( function(tx) {
-    //print('... read from database ' + field)
-    var rsArray=[];
-    //print('select DISTINCT '+field+' from '+table+' WHERE username="'+username+'"'+where+' ORDER BY '+field+' ASC');
-    var rs = tx.executeSql('select DISTINCT '+field+' from '+table+' WHERE username="'+username+'"'+where+' ORDER BY '+field+' ASC');
-    for(var i = 0; i < rs.rows.length; i++) {
-        rsArray.push(rs.rows.item(i)[field])
-    }
-    callback(rsArray);
- });
-}
-
-function showMessage(header,message,rootwindow){//print(message);
-    var cleanmessage=message.replace(/"/g,"-");
-    if(cleanmessage.length>200){cleanmessage=cleanmessage.slice(0,200)+'...'}
-    var messageString='import QtQuick 2.0; import QtQuick.Dialogs 1.2; MessageDialog{ visible: true; title:"'+header+'";standardButtons: StandardButton.Ok; text:" '+cleanmessage+'"}';
-    var messageObject=Qt.createQmlObject(messageString,rootwindow,"messageOutput");
-}
-
-function inArray(list, prop, val) {
-    if (list.length > 0 ) {
-        for (var i in list) { if (list[i][prop] == val) {
-                return i;
-            }
-        }
-    } return -1;
-}
-function cleanArray(array) {
-var arraystring=JSON.stringify(array);
-    arraystring=arraystring.replace(/[\[\]]/g , '');
-return arraystring;
-}
-
-function cleanDate(date){
-var cleanedDate= date.slice(0,3)+", "+date.slice(8,11)+date.slice(4,7)+date.slice(25,30)+date.slice(10,25);
-return cleanedDate
-}
diff --git a/source-android/js/image.js b/source-android/js/image.js
deleted file mode 100644
index 9a91d09..0000000
--- a/source-android/js/image.js
+++ /dev/null
@@ -1,286 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-.pragma library
-.import QtQuick.LocalStorage 2.0 as Sql
-.import "qrc:/js/helper.js" as Helperjs
-
-function requestList(login,database,onlynew,rootwindow,callback) {
-    //get list of own images and call download function
-    Helperjs.friendicaRequest(login,"/api/friendica/photos/list", rootwindow,function (helperobject){
-   //print("return"+helperobject);
-   var obj=JSON.parse(helperobject);
-   if (onlynew){Helperjs.readField("id",database,"imageData",login.username,function(AllStoredImages){
-        if (AllStoredImages.length>0){
-            for(var i=0;i< AllStoredImages.length;i++){
-                var position=Helperjs.inArray(obj,"id",AllStoredImages[i]);
-                if (position>-1){obj.splice(position,1)}
-             }
-        }
-      callback(obj)
-    })}
-   else{callback(obj)}
-})}
-
-function dataRequest(login,photoID,database,xhr,rootwindow) {
-    // check if image exist and call download function
-    Helperjs.friendicaRequest(login,"/api/friendica/photo?photo_id="+photoID, rootwindow, function (image){
-        try{ if(image==""){currentimageno=currentimageno+1}else{
-            var obj = JSON.parse(image);
-            var helpfilename=obj.filename.substring(0,obj.filename.lastIndexOf("."));
-            var filesuffix="";
-            if (obj.type=="image/jpeg"){filesuffix=".jpg"}
-            else if (obj.type=="image/png"){filesuffix=".png"}
-            else {filesuffix=""}
-            if (helpfilename==""){// check if file has any filename
-                obj.filename=obj["id"]+filesuffix;
-            }
-            else{obj.filename=helpfilename+filesuffix}
-            var link="";
-            if(obj["link"][0]){link=obj["link"][0]} else{link=obj["link"]["4"]}
-            xhr.setUrl(Qt.resolvedUrl(link));
-            xhr.setLogin(login.username+":"+Qt.atob(login.password));
-            xhr.setFilename(login.imagestore+'albums/'+obj.album+"/"+obj["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 = "'+obj["id"]+'"');
-               if(result.rows.length === 1) {// use update
-               result = tx.executeSql('UPDATE imageData SET username ="' +login.username+ '",id="'+obj.id+'", created="'+obj.created+'", edited="'+obj.edited+'", profile="'+obj.profile+'", link="'+obj["link"]["4"]+'", filename="'+obj.filename+'",title="'+obj.title+'", desc="'+obj.desc+'",   type="'+obj.type+'", width="'+obj.width+'", height="'+obj.height+'", album="'+obj.album+'", location="file://'+login.imagestore+'albums/'+obj.album+'/" where id="'+obj["id"]+'"');
-               } else {// use insert print('... does not exists, create it')
-               result = tx.executeSql('INSERT INTO imageData VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)', [login.username,obj.id,obj.created,obj.edited, obj.title, obj.desc, obj.album, obj.filename, obj.type, obj.height, obj.width,obj. profile,obj["link"]["4"],'file://'+login.imagestore+'albums/'+obj.album+"/"]);
-               }
-           })}}
-           catch (e){print("Data retrieval failure! "+ e+obj);}
-})}
-
-function storeImagedata(login,database,imagedata,rootwindow) {
-    // check if image exist and call download function
-            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 = "'+imagedata["id"]+'"');
-               if(result.rows.length === 1) {// use update
-               result = tx.executeSql('UPDATE imageData SET username ="' +login.username+ '",id="'+imagedata.id+'", created="'+imagedata.created+'", edited="'+imagedata.edited+'", profile="'+imagedata.profile+'", link="'+imagedata.link[0]+'", filename="'+imagedata.filename+'",title="'+imagedata.title+'", desc="'+imagedata.desc+'",   type="'+imagedata.type+'", width="'+imagedata.width+'", height="'+imagedata.height+'", album="'+imagedata.album+'", location="file://'+login.imagestore+'albums/'+imagedata.album+'/" where id="'+imagedata["id"]+'"');
-               } else {// use insert print('... does not exists, create it')
-               result = tx.executeSql('INSERT INTO imageData VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)', [login.username,imagedata.id,imagedata.created,imagedata.edited, imagedata.title, imagedata.desc, imagedata.album, imagedata.filename, imagedata.type, imagedata.height, imagedata.width,imagedata. profile,imagedata.link[0],'file://'+login.imagestore+'albums/'+imagedata.album+"/"]);
-               }
-})}
-
-function deleteImage(database,login,type,location,filesystem,rootwindow,callback) { // delete image locally and on server
-    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-    var rsfilename=location.substring(location.lastIndexOf("/")+1,location.length);
-    var rslocation=location.substring(0,location.lastIndexOf("/")+1);
-    //print(type+" Name "+ rsfilename+" Location: "+rslocation)
-    db.transaction( function(tx) {
-        if (type=='image'){
-            var rs= tx.executeSql('SELECT * FROM imageData WHERE filename="'+rsfilename+'" AND location="'+rslocation+'"')
-            var imageId=rs.rows.item(0).id;
-            Helperjs.friendicaPostRequest(login,"/api/friendica/photo/delete?photo_id="+imageId,"","DELETE",rootwindow, function (obj){
-                //var deletereturn = JSON.parse(obj); print(obj);
-                //if (deletereturn.result=="deleted"){
-                        db.transaction( function(tx) {
-                            var deleters=tx.executeSql('DELETE  FROM imageData WHERE location="'+rslocation+'" AND filename="'+rsfilename+'"'); });
-                            filesystem.Directory=rslocation.substring(7,rslocation.length-1);
-                            filesystem.rmFile(rsfilename)
-           //}
-            })
-        }
-        else{
-            Helperjs.friendicaPostRequest(login,"/api/friendica/photoalbum/delete?album="+rsfilename,"","DELETE",rootwindow, function (obj){
-                //var deletereturn = JSON.parse(obj);
-                //if (deletereturn.result=="deleted"){
-                    db.transaction( function(tx) {
-                        var rs= tx.executeSql('SELECT DISTINCT location FROM imageData WHERE album="'+rsfilename+'" AND username="'+login.username+'"');
-                        var locationstring=rs.rows.item(0).location;
-                        filesystem.Directory=locationstring.substring(7,locationstring.length-1);
-                        filesystem.rmDir();
-                        var deleters=tx.executeSql('DELETE  FROM imageData WHERE album="'+location+'"');
-                    })
-               //}
-           })
-        }
-        callback(location)
-    })
-}
-
-function updateImage(database,login,type,filesystem,imageId,rootwindow,callback) { // delete image locally and on server
-    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-    Helperjs.readData(database,"imageData",login.username,function(obj){
-        db.transaction( function(tx) {
-        if (type=='image'){
-            var deleters=tx.executeSql('DELETE  FROM imageData WHERE location="'+obj[0].location+'" AND filename="'+obj[0].filename+'"');
-             filesystem.Directory=obj[0].location
-             filesystem.rmFile(obj[0].filename)
-           }
-            })
-        },"id",imageId);
-    callback()
-}
-
-
-function deleteContacts(database,user,callback) { // does nothing useful at the moment
-    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-    //print(' delete Image Data() for ' + field +"="+selection)
-    db.transaction( function(tx) {
-        result1= tx.executeSql('SELECT * FROM contacts a LEFT OUTER JOIN news b ON  a.url==b.uid');
-        result2= tx.executeSql('SELECT * FROM contacts a LEFT OUTER JOIN news b ON  a.url==b.uid');
-    callback(result)})
-}
-
-//function requestFriendsAlbumPictures(login,friend,rootwindow,callback){
-//// screenscraping of albums page of contact without user and password
-//    Helperjs.friendicaWebRequest(friend.url.replace("profile","photos"),rootwindow,function(photohtml){
-//    //print(photohtml);
-//    var photoarray=[];
-//    var arr = photohtml.split("sidebar-photos-albums-li");
-//    for (var i=2;i<arr.length;i++){
-//        var albumlink = arr[i].substring(arr[i].indexOf('http'),arr[i].indexOf('class')-2);
-//        var albumname=arr[i].substring(arr[i].indexOf('/span')+6,arr[i].indexOf('</a>')-1);
-//        var album={'link':albumlink,'name':albumname}
-//      photoarray.push(album);
-//    }
-//    callback(photoarray)
-// })
-//}
-
-function newRequestFriendsAlbumPictures(login,friend,rootwindow,callback){
-// screenscraping of albums page of contact with remoteAuth
-    Helperjs.friendicaRemoteAuthRequest(login,friend.url.replace("profile","photos"),friend.url,rootwindow,function(photohtml){
-        try {var obj=JSON.parse(photohtml);
-            if (obj.hasOwnProperty('status')){
-                Helperjs.friendicaWebRequest(friend.url.replace("profile","photos"),rootwindow,function(photohtml){
-                    getAlbumFromHtml(photohtml,false,rootwindow,callback)})
-            }}
-        catch (e){
-            getAlbumFromHtml(photohtml,true,rootwindow,callback)
-        }
-    })
-}
-
-function getAlbumFromHtml(photohtml,remoteAuthBool,rootwindow,callback){
-    var photoarray=[];
-    var arr = photohtml.split("sidebar-photos-albums-li");
-    for (var i=2;i<arr.length;i++){
-        var albumlink = arr[i].substring(arr[i].indexOf('http'),arr[i].indexOf('class')-2);
-        var albumname=arr[i].substring(arr[i].indexOf('/span')+6,arr[i].indexOf('</a>')-1);
-        var album={'link':albumlink,'name':albumname}//print(albumlink+" "+albumname);
-      photoarray.push(album);
-    }
-    callback(photoarray,remoteAuthBool)
-}
-
-
-function newRequestFriendsPictures(login,link,friend,remoteAuthBool,remoteauth,rootwindow,callback){
-// screenscraping of pictures page for given album
-    if (remoteAuthBool){
-        remoteauth.setUrl(login.server);
-        remoteauth.setLogin(login.username+":"+Qt.atob(login.password));
-        remoteauth.setContacturl(friend.url);
-        Helperjs.friendicaRemoteAuthRequest(login,link,friend.url,rootwindow,function(photohtml){
-            getPictureFromHtml(photohtml,remoteAuthBool,function(photoarray){
-                callback(photoarray)
-            })
-        })}
-    else{
-        Helperjs.friendicaWebRequest(link,rootwindow,function(photohtml){
-            getPictureFromHtml(photohtml,remoteAuthBool,function(photoarray){
-                callback(photoarray)
-            })
-        })
-    }
-}
-
-function getPictureFromHtml(photohtml,remoteAuthBool,callback){
-    var photoarray=[];
-     var basehtml=photohtml.substring(photohtml.indexOf('<base')+12,photohtml.indexOf('/>',photohtml.indexOf('<base'))-2);
-
-// old theme
-   if (photohtml.indexOf("photo-album-image-wrapper-end")>-1){ //theme 1
-   var arr = photohtml.split("photo-album-image-wrapper-end");}
-
-// other themes
-   if (photohtml.indexOf("photo-album-wrapper")>-1){ //theme 2
-        var photoarea=photohtml.substring(photohtml.indexOf("photo-album-wrapper"),photohtml.indexOf("photo-album-end"))
-       var arr = photoarea.split("</a>");}
-   //print("Url: "+login.server+ "Contacturl: "+friend.url)
-//   remoteauth.setUrl(login.server);
-//   remoteauth.setLogin(login.username+":"+Qt.atob(login.password));
-//   remoteauth.setContacturl(friend.url);
-    for (var i=0;i<arr.length-1;i++){
-        var photoname=arr[i].substring(arr[i].lastIndexOf('alt')+5,arr[i].lastIndexOf('title')-2);
-        var thumblink=arr[i].substring(arr[i].lastIndexOf('<img')+10,arr[i].lastIndexOf('alt')-2);
-        var imagetype=thumblink.substring(thumblink.lastIndexOf("."));
-        var photolink=thumblink.substring(0,thumblink.length-imagetype.length-2)+"-0"+imagetype
-        if(thumblink.substring(0,4)!=="http"){thumblink=basehtml+thumblink}
-        if(photolink.substring(0,4)!=="http"){photolink=basehtml+photolink}
-        if(remoteAuthBool){
-            thumblink="image://remoteauthimage/"+thumblink;
-            photolink="image://remoteauthimage/"+photolink;
-        }
-        //Helperjs.friendicaRemoteAuthRequest(login,thumblink,friend.url,rootwindow,function(thumbimage){thumbbase64=QT.btoa(thumbimage)});
-        //thumblink="image://remoteauthimage/"+login.username+":"+Qt.atob(login.password)+"@"+login.server+"/api/friendica/remoteauth?c_url="+friend.url+"&url="+thumblink;
-        var photo={'link':photolink,'name':photoname,'thumb':thumblink}
-      photoarray.push(photo);
-    }
-    callback(photoarray)
-}
-
-
-function requestFriendsPictures(link,rootwindow,callback){
-// screenscraping of pictures page for given album
-    Helperjs.friendicaWebRequest(link,rootwindow,function(photohtml){
-    var photoarray=[];
-     var basehtml=photohtml.substring(photohtml.indexOf('<base')+12,photohtml.indexOf('/>',photohtml.indexOf('<base'))-2);
-
-// old theme
-   if (photohtml.indexOf("photo-album-image-wrapper-end")>-1){ //theme 1
-   var arr = photohtml.split("photo-album-image-wrapper-end");}
-
-// other themes
-   if (photohtml.indexOf("photo-album-wrapper")>-1){ //theme 2
-        var photoarea=photohtml.substring(photohtml.indexOf("photo-album-wrapper"),photohtml.indexOf("photo-album-end"))
-       var arr = photoarea.split("</a>");}
-
-    for (var i=0;i<arr.length-1;i++){
-        var photoname=arr[i].substring(arr[i].lastIndexOf('alt')+5,arr[i].lastIndexOf('title')-2);
-        var thumblink=arr[i].substring(arr[i].lastIndexOf('<img')+10,arr[i].lastIndexOf('alt')-2);
-        var imagetype=thumblink.substring(thumblink.lastIndexOf("."));
-        var photolink=thumblink.substring(0,thumblink.length-imagetype.length-2)+"-0"+imagetype
-        if(thumblink.substring(0,4)!=="http"){thumblink=basehtml+thumblink}
-        if(photolink.substring(0,4)!=="http"){photolink=basehtml+photolink}
-        var photo={'link':photolink,'name':photoname,'thumb':thumblink}
-      photoarray.push(photo);
-    }
-    callback(photoarray)
-    })
-}
-
diff --git a/source-android/js/layout.js b/source-android/js/layout.js
deleted file mode 100644
index 6431819..0000000
--- a/source-android/js/layout.js
+++ /dev/null
@@ -1,75 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-function showFriends(db) {
-    Service.readActiveConfig(db,function(login){
-        Service.requestFriends(login.url,login.user,login.password,displayFriends);
-    });
-}
-function displayFriends(obj){
-     for (var i=0; i<obj.length; i++){
-                //print(obj[i]);
-                if (obj[i]) {friendsModel.append({"friendName": obj[i]});
-                };
-         
-}}
-
-function ensureVisibility(c,f)
-{
-    if (f.contentX >= c.x)
-        f.contentX = c.x;
-    else if (f.contentX+f.width <= c.x+c.width)
-        f.contentX = c.x+c.width-f.width;
-    if (f.contentY >= c.y)
-        f.contentY = c.y;
-    else if (f.contentY+f.height <= c.y+c.height)
-        f.contentY = c.y+c.height-f.height;
-}
-
-function createObject(objectQml,qmlParameters,parentitem,callback) {
-   var component = Qt.createComponent(objectQml);
-    if (component.status === Component.Ready || component.status === Component.Error)
-       finishCreation(component,qmlParameters,parentitem,callback);
-    else
-       component.statusChanged.connect(finishCreation(qmlParameters)); 
-} 
-
-function finishCreation(component,qmlParameters,parentitem,callback) {
-    if (component.status === Component.Ready) {
-       var createdObject = component.createObject(parentitem, qmlParameters);
-   if (createdObject === null)
-    print("Error creating image"); }
-  else if (component.status === Component.Error)
-    print("Error loading component:"+component.errorString());
-    else {print("created")}
-    //callback(createdObject);
-}
-
diff --git a/source-android/js/news.js b/source-android/js/news.js
deleted file mode 100644
index a827f11..0000000
--- a/source-android/js/news.js
+++ /dev/null
@@ -1,580 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-.pragma library
-.import QtQuick.LocalStorage 2.0 as Sql
-.import "qrc:/js/helper.js" as Helperjs
-
-function requestFriends(login,database,rootwindow,callback){
-//    return array of friends
-    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-    db.transaction( function(tx) {
-         var result = tx.executeSql('UPDATE contacts SET isFriend=0 where username="'+login.username+'"')}); // clean old friends
-        Helperjs.friendicaRequest(login,"/api/statuses/friends?count=9999", rootwindow,function (obj){
-       var friends=JSON.parse(obj);
-       for (var i=0;i<friends.length;i++){
-           friends[i].created_at=Date.parse(cleanDate(friends[i].created_at));
-           friends[i].isFriend=1
-       }
-       //try{requestProfile(login,friends,rootwindow,function(friends_profile){callback(friends_profile)})}
-       //catch(e){
-       callback(friends)//}
-    });
-}
-
-function requestGroups(login,database,rootwindow,callback){
-   // retrieve, save and return groups. Other features currently not implemented
-    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-    Helperjs.friendicaRequest(login,"/api/friendica/group_show",rootwindow, function (obj){
-       var groups=JSON.parse(obj);
-        db.transaction( function(tx) {
-             var result = tx.executeSql('DELETE from groups where username="'+login.username+'"'); // clean old groups
-       for (var i=0;i<groups.length;i++){
-           var memberarray=[]; for (var user in groups[i].user){memberarray.push(parseInt(groups[i].user[user].id))}
-          //print("Members: "+groups[i].user)
-               var result2 = tx.executeSql('INSERT INTO groups VALUES (?,?,?,?)', [login.username,groups[i].name,groups[i].gid,JSON.stringify(memberarray)])}
-        callback()
-        });
-})}
-
-function listFriends(login,database,callback,filter){
-    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-    var filtertext='';
-    try {filtertext=' AND screen_name like "' + filter+'%"'}catch(e){}
-    db.transaction( function(tx) {
-        //var result = tx.executeSql('SELECT * from contacts WHERE username="'+login.username+'" AND isFriend>0'+filtertext);
-        //print('SELECT * from contacts WHERE username="'+login.username+'"'+filtertext);
-        var result = tx.executeSql('SELECT * from contacts WHERE username="'+login.username+'" AND isFriend>0'+filtertext);
-        // check for friends
-        var contactlist=[];
-        for (var i=0;i<result.rows.length;i++){
-            contactlist.push(result.rows.item(i))
-        }
-        callback(contactlist)
-    });
-}
-
-function deleteGroup(login,database,rootwindow,group, callback){
-    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-    Helperjs.friendicaPostRequest(login,"/api/friendica/group_delete?gid="+group.gid+"&name="+group.groupname,"","POST",rootwindow, function (obj){
-        var deletereturn=JSON.parse(obj);
-        if(deletereturn.success){
-        db.transaction( function(tx) {
-             var result = tx.executeSql('DELETE from groups where username="'+login.username+'" AND groupname="'+group.name+'"'); // delete group
-        callback()
-        });
-}})}
-
-function getLastNews(login,database,callback){
-    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-    var lastnewsid=0;
-    db.transaction( function(tx) {
-            var result = tx.executeSql('SELECT status_id from news WHERE username="'+login.username+'" AND messagetype=0 ORDER BY status_id  DESC LIMIT 1');
-            try{lastnewsid=result.rows.item(0).status_id;}catch(e){print(e)};
-            callback(lastnewsid)
-        })
-}
-
-
-
-//function getFriendsTimeline(login,database,contacts,onlynew,rootwindow,callback){
-//    // retrieve and return timeline since last news, return contacts which are not friends and older than 2 days for update (friends can be updated in Contactstab)
-//    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-//    var parameter = "?count=50";
-//    if(onlynew){db.transaction( function(tx) {
-//        var result = tx.executeSql('SELECT status_id from news WHERE username="'+login.username+'" AND messagetype=0 ORDER BY status_id  DESC LIMIT 1'); // check for last news id
-//        try{parameter=parameter+"&since_id="+result.rows.item(0).status_id;}catch(e){};})}
-//        var newContacts=[];
-//        Helperjs.friendicaRequest(login,"/api/statuses/friends_timeline"+parameter, rootwindow,function (obj){
-//            var news=JSON.parse(obj);
-//            if (news.hasOwnProperty('status')){
-//                Helperjs.showMessage(qsTr("Error"),"API:\n" +login.server+"/api/statuses/friends_timeline"+parameter+"\n Return: \n"+obj,rootwindow)
-//            }
-//            var newContacts=findNewContacts(news,contacts);
-//            callback(news,newContacts)
-//})}
-
-function getCurrentContacts(login,database,callback){
-    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-    var contactlist=[];
-    db.transaction( function(tx) {
-        var result = tx.executeSql('SELECT url from contacts WHERE username="'+login.username+'" AND isFriend=1'); // check for friends
-        for (var i=0;i<result.rows.length;i++){
-           contactlist.push(result.rows.item(i).url )
-           //print(result.rows.item(i).url)
-         }
-    var lastDate=Date.now()-604800000;//  7 days old
-    //print('SELECT url from contacts WHERE username="'+login.username+'" AND isFriend=0 AND imageAge>'+lastDate);
-    var result2 = tx.executeSql('SELECT url from contacts WHERE username="'+login.username+'" AND isFriend=0 AND imageAge > '+lastDate);
-    for (var j=0;j<result2.rows.length;j++){
-               contactlist.push(result2.rows.item(j).url )
-         }
-    })
-    callback(contactlist)
-}
-
-function findNewContacts(news,contacts){
-    var newContacts=[];
-    for (var i=0;i<news.length;i++){
-        var url=news[i].user.url;
-        if(contacts.indexOf(url)==-1 &&  !(inArray(newContacts,"url",url))){
-            news[i].user.isFriend=0;
-            newContacts.push(news[i].user);
-            }
-        if (news[i].hasOwnProperty('friendica_activities') && news[i].friendica_activities.like.length>0){
-            for (var j=0;j<news[i].friendica_activities.like.length;j++){
-                var like_url=news[i].friendica_activities.like[j].url;
-                if(contacts.indexOf(like_url)==-1 &&  !(inArray(newContacts,"url",like_url))){
-                    news[i].friendica_activities.like[j].isFriend=0;
-                    newContacts.push(news[i].friendica_activities.like[j]);
-                }
-            }
-         }
-         if (news[i].hasOwnProperty('friendica_activities') && news[i].friendica_activities.dislike.length>0){
-            for (var k=0;j<news[k].friendica_activities.dislike.length;k++){
-                var dislike_url=news[i].friendica_activities.dislike[k].url;
-                if(contacts.indexOf(dislike_url)==-1 &&  !(inArray(newContacts,"url",dislike_url))){
-                    news[i].friendica_activities.dislike[k].isFriend=0;
-                        newContacts.push(news[i].friendica_activities.dislike[k]);
-                }
-            }
-         }
-
-         if(news[i].hasOwnProperty('friendica_author')){
-             var owner_url=news[i].friendica_author.url;
-             if(contacts.indexOf(owner_url)==-1 &&  !(inArray(newContacts,"url",owner_url))){
-                 news[i].friendica_author.isFriend=0;
-                 newContacts.push(news[i].friendica_author);
-                 }
-         }
-    }
-    return newContacts
-}
-
-function storeNews(login,database,news,rootwindow){
-// save news after contacts download, call next function
-    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-    for (var i=0;i<news.length;i++){
-        //print('store news data for ' + news[i].id+JSON.stringify(news[i].friendica_author));
-        //var ausdruck=news[i];
-        var likearray=[];var dislikearray=[];var attendyesarray=[];var attendnoarray=[];var attendmaybearray=[];
-        if(news[i].hasOwnProperty('friendica_activities')){
-             for (var user in news[i].friendica_activities.like){likearray.push(news[i].friendica_activities.like[user].url)}
-             for (var user in news[i].friendica_activities.dislike){dislikearray.push(news[i].friendica_activities.dislike[user].url)}
-             for (var user in news[i].friendica_activities.attendyes){attendyesarray.push(news[i].friendica_activities.attendyes[user].url)}
-             for (var user in news[i].friendica_activities.attendno){attendnoarray.push(news[i].friendica_activities.attendno[user].url)}
-             for (var user in news[i].friendica_activities.attendmaybe){attendmaybearray.push(news[i].friendica_activities.attendmaybe[user].url)}
-        }
-        var friendica_activities=[likearray,dislikearray,attendyesarray,attendnoarray,attendmaybearray]
-        var attachments="";if (news[i].attachments){attachments=Qt.btoa(JSON.stringify(news[i].attachments))}
-        db.transaction( function(tx) {
-            var result = tx.executeSql('SELECT * from news where username="'+login.username+'" AND status_id = "'+news[i].id+'" AND messagetype='+news[i].messagetype); // check for news id
-            if(result.rows.length === 1) {// use update
-                //print(news[i].id +' news exists, update it'+'UPDATE news SET username="'+login.username+'", messagetype=0, text="'+Qt.btoa(news[i].text)+'", created_at="'+Date.parse(cleanDate(news[i].created_at))+'", in_reply_to_status_id="'+news[i].in_reply_to_status_id+'", source="'+news[i].source+'", status_id="'+news[i].id+'", in_reply_to_user_id="'+news[i].in_reply_to_user_id+'", geo="'+news[i].geo+'", favorited="'+news[i].favorited+'", uid="'+news[i].user.id+'", statusnet_html="'+Qt.btoa(news[i].status_html)+'", statusnet_conversation_id="'+news[i].statusnet_conversation_id+'",friendica_activities="'+Qt.btoa(JSON.stringify(friendica_activities))+'",attachments="'+attachments+'",friendica_owner="'+news[i].friendica_owner.url+'" where username="'+login.username+'" AND status_id="'+news[i].status_id+'" AND messagetype=0')
-                result = tx.executeSql('UPDATE news SET username="'+login.username+'", messagetype='+news[i].messagetype+', text="'+Qt.btoa(news[i].text)+'", created_at="'+news[i].created_at+'", in_reply_to_status_id="'+news[i].in_reply_to_status_id+'", source="'+news[i].source+'", status_id="'+news[i].id+'", in_reply_to_user_id="'+news[i].in_reply_to_user_id+'", geo="'+news[i].geo+'", favorited="'+news[i].favorited+'", uid="'+news[i].user.id+'", statusnet_html="'+Qt.btoa(news[i].status_html)+'", statusnet_conversation_id="'+news[i].statusnet_conversation_id+'",friendica_activities="'+Qt.btoa(JSON.stringify(friendica_activities))+'",attachments="'+attachments+'",friendica_owner="'+news[i].friendica_author.url+'" where username="'+login.username+'" AND status_id="'+news[i].status_id+'" AND messagetype=0');
-            } else {// use insert
-                result = tx.executeSql('INSERT INTO news (username,messagetype,text,created_at,in_reply_to_status_id,source,status_id,in_reply_to_user_id,geo,favorited,uid,statusnet_html,statusnet_conversation_id,friendica_activities,friendica_activities_self,attachments,friendica_owner) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)', [login.username,news[i].messagetype,Qt.btoa(news[i].text),news[i].created_at, news[i].in_reply_to_status_id, news[i].source, news[i].id,news[i].in_reply_to_user_id,news[i].geo,news[i].favorited, news[i].user.id,Qt.btoa(news[i].statusnet_html),news[i].statusnet_conversation_id, Qt.btoa(JSON.stringify(friendica_activities)),"[]",attachments,news[i].friendica_author.url])}})
-            }
-   // getDirectMessage(login,database,rootwindow,callback)
-}
-
-//function getDirectMessage(login,database,rootwindow,callback){
-//    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-//    var parameter = "";
-//    db.transaction( function(tx) {
-//        var result = tx.executeSql('SELECT status_id from news WHERE username="'+login.username+'" AND messagetype=1 ORDER BY status_id  DESC LIMIT 1'); // check for last news id
-//        try{parameter="&since_id="+result.rows.item(0).status_id;}catch(e){};})
-//    Helperjs.friendicaRequest(login,"/api/direct_messages/all"+parameter,rootwindow, function (obj){
-//        var messages=JSON.parse(obj);
-//       for (var i=0;i<messages.length;i++){
-//           //print('store message data for '+JSON.stringify(messages[i]));
-//            db.transaction( function(tx) {
-//             var result = tx.executeSql('SELECT * from news where username= "'+login.username+'" AND status_id = "'+messages[i].id+'" AND messagetype=1'); // check for news id
-//             if(result.rows.length === 1) {// use update
-//                print(messages[i].id +' directmessage exists, update it')
-//                result = tx.executeSql('UPDATE news SET username="'+login.username+'", messagetype=1, text="'+Qt.btoa(messages[i].text)+'", created_at="'+Date.parse(cleanDate(messages[i].created_at))+'", source="Friendica", status_id="'+messages[i].id+'", uid="'+messages[i].sender.id+'", statusnet_html="'+Qt.btoa(messages[i].text)+'", statusnet_conversation_id="'+messages[i].friendica_parent_uri+'" where username="'+login.username+'" AND status_id="'+messages[i].status_id+'" AND messagetype=1');
-//            } else {// use insert
-//                result = tx.executeSql('INSERT INTO news (username,messagetype,text,created_at,source,status_id,uid,statusnet_html,statusnet_conversation_id) VALUES (?,?,?,?,?,?,?,?,?)', [login.username,1,Qt.btoa(messages[i].text),Date.parse(cleanDate(messages[i].created_at)), "Friendica", messages[i].id, messages[i].sender.id,Qt.btoa(messages[i].text),messages[i].friendica_parent_uri])}
-//            });
-//       }
-//   })
-//    callback()
-////    if(login.newsViewType=="Timeline"){newsfromdb(database,login.username,callback)}
-////    else{chatsfromdb(database,login.username,callback)}
-//}
-
-//function getNotifications(login,database,rootwindow,callback){
-//   Helperjs.friendicaRequest(login,"/api/friendica/notifications", rootwindow,function (obj){
-//        var messages=JSON.parse(obj);
-//        var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-//        for (var i=0;i<messages.length;i++){
-//            //print('store message data for '+JSON.stringify(messages[i]));
-//            db.transaction( function(tx) {
-//             var result = tx.executeSql('SELECT * from news where username="'+login.username+'" AND status_id = "'+messages[i].id+'" AND messagetype=2'); // check for news id
-//             if(result.rows.length === 1) {// use update
-//                print(messages[i].id +' Notification exists, update it')
-//                result = tx.executeSql('UPDATE news SET username="'+login.username+'", messagetype=2, text="'+Qt.btoa(messages[i].msg_html)+'", created_at="'+Date.parse(messages[i].date)+'", source="Friendica", status_id="'+messages[i].id+'", uid="'+messages[i].uid+'", statusnet_html="'+Qt.btoa(messages[i].msg_html)+'", statusnet_conversation_id="'+messages[i].parent+'" where username="'+login.username+'" AND status_id="'+messages[i].id+'" AND messagetype=2');
-//            } else {// use insert
-//                result = tx.executeSql('INSERT INTO news (username,messagetype,text,created_at,source,status_id, uid,statusnet_html,statusnet_conversation_id) VALUES (?,?,?,?,?,?,?,?,?)', [login.username,2,Qt.btoa(messages[i].msg_html),Date.parse(messages[i].date),"Friendica", messages[i].id, messages[i].uid,Qt.btoa(messages[i].msg_html),messages[i].parent])}
-//             });
-//       }
-//       db.transaction( function(tx) {
-//        var newsrs=tx.executeSql('select * from news WHERE username="'+login.username+'" AND messagetype=2 ORDER BY status_id DESC LIMIT 20');
-//        var newsArray=[];
-//        for(var j = 0; j < newsrs.rows.length; j++) {
-//          newsArray.push(newsrs.rows.item(j));
-//          newsArray[j].statusnet_html=Qt.atob(newsArray[j].statusnet_html);
-//          callback(newsArray);
-//        }
-//   })
-//})}
-
-function getActivitiesUserData(allcontacts,userUrlArray){//print(JSON.stringify(userUrlArray));
-    var helpArray=[];
-    for (var i=0;i<userUrlArray.length;i++){
-       helpArray.push(objFromArray(allcontacts,"url",userUrlArray[i]));
-    }
-    return helpArray
-}
-
-function newsfromdb(database,login,messagetype,callback,contact,stop_time){
-// return news before stop_time (used by More button), in brackets of 20 entries, or by specified contact
-    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-    db.transaction( function(tx) {
-        var result = tx.executeSql('SELECT status_id from news WHERE username="'+login.username+'" AND messagetype=0 ORDER BY status_id  DESC LIMIT 1');
-        try{var lastid=result.rows.item(0).status_id;}catch(e){var lastid=0};
-
-        if (!stop_time){var stop="";
-            try{var rs = tx.executeSql('select created_at from news WHERE username="'+login.username+'" AND messagetype="'+messagetype+'" ORDER BY created_at DESC LIMIT 1');
-            stop="<="+rs.rows.item(0).created_at}catch(e){stop="<99999999999999"}}
-        else{var stop="<"+stop_time}
-        var contactfilter="";if(contact){contactfilter=" AND (uid='"+contact+"' OR friendica_owner='"+contact+"')"}
-        //print('select * from news WHERE username="'+username+'" AND created_at'+stop+contactfilter+' ORDER BY created_at DESC LIMIT 20');
-        var newsrs=tx.executeSql('select * from news WHERE username="'+login.username+'" AND messagetype="'+messagetype+'" AND created_at'+stop+contactfilter+' ORDER BY created_at DESC LIMIT 20');
-        var newsArray=[];
-        var allcontacts=getAllContacts(database,login.username);
-
-        for(var i = 0; i < newsrs.rows.length; i++) {
-            newsArray.push(newsrs.rows.item(i));
-            newsArray[i].statusnet_html=Qt.atob(newsArray[i].statusnet_html);
-            newsArray[i].text=Qt.atob(newsArray[i].text);
-            newsArray[i].id=newsArray[i].status_id;
-            newsArray[i].friendica_author=newsArray[i].friendica_owner
-            newsArray[i]=fetchUsersForNews(database,login.username,newsArray[i],allcontacts);
-            if (newsArray[i].attachments!="" && newsArray[i].attachments!==null){newsArray[i].attachments=JSON.parse(Qt.atob(newsArray[i].attachments))};
-        }
-    callback(newsArray,lastid)});
-}
-
-
-function fetchUsersForNews(database,username,news,allcontacts){//print("fetchusers "+JSON.stringify(news))
-    news.user=objFromArray(allcontacts,"id",news.uid);
-    if(news.in_reply_to_user_id){news.reply_user=objFromArray(allcontacts,"id",news.in_reply_to_user_id)}
-    //news.friendica_owner_object=objFromArray(allcontacts,"url",news.friendica_owner);
-    news.friendica_author=objFromArray(allcontacts,"url",news.friendica_author);
-    if (news.messagetype==0){
-       var friendicaArray=JSON.parse(Qt.atob(news.friendica_activities));
-        delete news.friendica_activities;
-        news.friendica_activities={};
-       //for(var j=0;j<friendicaArray.length;j++){
-       news.friendica_activities.like=getActivitiesUserData(allcontacts,friendicaArray[0]);
-       news.friendica_activities.dislike=getActivitiesUserData(allcontacts,friendicaArray[1]);
-       news.friendica_activities.attendyes=getActivitiesUserData(allcontacts,friendicaArray[2]);
-       news.friendica_activities.attendno=getActivitiesUserData(allcontacts,friendicaArray[3]);
-       news.friendica_activities.attendmaybe=getActivitiesUserData(allcontacts,friendicaArray[4]);
-            //}
-    }
-    return news
-}
-
-function deleteNews(login,database,newsid,messagetype,rootwindow,callback){
-    var api="" ;
-    if (messagetype==0){ api="/api/statuses/destroy?id="}
-    else if (messagetype==1){ api="/api/direct_messages/destroy?id="}
-    else if (messagetype==2){ api="/api/friendica/notifications/seen?id="}
-    Helperjs.friendicaPostRequest(login,api+newsid,"","POST", rootwindow,function (obj){
-        var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-         db.transaction( function(tx) {var result = tx.executeSql('DELETE from news where username="'+login.username+'" AND messagetype='+messagetype+' AND status_id ='+newsid); // delete news id
-             callback(obj)
-   });
-})}
-
-function retweetNews(login,database,newsid,rootwindow,callback){
-    Helperjs.friendicaPostRequest(login,"/api/statuses/retweet?id="+newsid,"","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)}
-    })
-}
-
-function favorite(login,favorite,newsid,rootwindow){
-// toggle favorites 
- if(favorite){  Helperjs.friendicaPostRequest(login,"/api/favorites/create?id="+newsid,"","POST", rootwindow,function (obj){
-   })}
-    else {Helperjs.friendicaPostRequest(login,"/api/favorites/destroy?id="+newsid,"","POST",rootwindow,function (obj){
-   })}
-}
-
-function  likerequest(login,database,verb,newsid,rootwindow){
-    Helperjs.friendicaPostRequest(login,"/api/friendica/activity/"+verb+"?id="+newsid, "","POST",rootwindow,function (obj){
-         if (obj=='"ok"'){
-            var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-            db.transaction( function(tx) {
-                var currentActivities_rs=tx.executeSql('select friendica_activities_self from news WHERE username="'+login.username+'" AND status_id='+newsid) ;
-                var currentActivities=JSON.parse(currentActivities_rs.rows.item(0).friendica_activities_self);
-                //print(verb+"currentActivities "+JSON.stringify(currentActivities));
-                if ((verb=="like")&&(currentActivities.indexOf(1)==-1)){ currentActivities.push(1);
-                    if (currentActivities.indexOf(2)!=-1){currentActivities.splice(currentActivities.indexOf(2),1)}
-                }
-                if ((verb=="dislike")&&(currentActivities.indexOf(2)==-1)){ currentActivities.push(2);
-                    if (currentActivities.indexOf(1)!=-1){currentActivities.splice(currentActivities.indexOf(1),1)}
-                }
-                if (verb=="unlike"){ if (currentActivities.indexOf(1)!=-1){currentActivities.splice(currentActivities.indexOf(1),1)}}
-                if (verb=="undislike"){ if (currentActivities.indexOf(2)!=-1){currentActivities.splice(currentActivities.indexOf(2),1)}}
-                //print(JSON.stringify(currentActivities));
-                var result = tx.executeSql('UPDATE news SET friendica_activities_self ="'+JSON.stringify(currentActivities)+'" where username="'+login.username+'" AND status_id ='+newsid);
-   })}
-    else{}})
-}
-
-function like(login,database,toggle,verb,newsid,rootwindow){
-    if(verb=="like"&& toggle==1){likerequest(login,database,"like",newsid,rootwindow);
-    }
-    if(verb=="dislike"&& toggle==1){likerequest(login,database,"dislike",newsid,rootwindow);
-    }
-    if(toggle==0){
-         likerequest(login,database,"un"+verb,newsid,rootwindow);}
-}
-
-function attend(login,database,attend,newsid,rootwindow,callback){
-    Helperjs.friendicaPostRequest(login,"/api/friendica/activity/attend"+attend+"?id="+newsid, "","POST",rootwindow,function (obj){
-            //print("attend: "+attend+obj);
-    if (obj=='"ok"')
-        var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-        db.transaction( function(tx) {
-            var currentActivities_rs=tx.executeSql('select friendica_activities_self from news WHERE username="'+login.username+'" AND status_id='+newsid) ;
-            var currentActivities=JSON.parse(currentActivities_rs.rows.item(0).friendica_activities_self);
-            if ((attend=="yes")&&(currentActivities.indexOf(3)==-1)){
-                currentActivities.push(3);
-                if (currentActivities.indexOf(4)!=-1){currentActivities.splice(currentActivities.indexOf(4),1)}
-                if (currentActivities.indexOf(5)!=-1){currentActivities.splice(currentActivities.indexOf(5),1)}
-                             //print(JSON.stringify(currentActivities));
-             }
-             if ((attend=="no")&&(currentActivities.indexOf(4)==-1)){
-                currentActivities.push(4);
-                if (currentActivities.indexOf(3)!=-1){currentActivities.splice(currentActivities.indexOf(3),1)}
-                if (currentActivities.indexOf(5)!=-1){currentActivities.splice(currentActivities.indexOf(5),1)}
-             }
-             if ((attend=="maybe")&&(currentActivities.indexOf(5)==-1)){
-                currentActivities.push(5);
-                if (currentActivities.indexOf(3)!=-1){currentActivities.splice(currentActivities.indexOf(3),1)}
-                if (currentActivities.indexOf(4)!=-1){currentActivities.splice(currentActivities.indexOf(4),1)}
-             }
-
-             var result = tx.executeSql('UPDATE news SET friendica_activities_self ="'+JSON.stringify(currentActivities)+'" where username="'+login.username+'" AND status_id ='+newsid);
-             callback();
- })})}
-
-function requestConversation(login,database,newsid,contacts,rootwindow,callback){
-    Helperjs.friendicaRequest(login,"/api/conversation/show?id="+newsid,rootwindow, function (obj){
-       var news=JSON.parse(obj);
-       var newContacts=findNewContacts(news,contacts);
-      // storeNews(login,database,news,rootwindow,callback)
-      callback(news,newContacts)
-})}
-
-function conversationfromdb(database,user,conversationId,callback){
-    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-    db.transaction( function(tx) {
-        var newsrs=tx.executeSql('select * from news WHERE username="'+user+'" AND statusnet_conversation_id="'+conversationId+'" ORDER BY created_at ASC');
-        var newsArray=[];
-        var allcontacts=getAllContacts(database,user);
-        for(var i = 0; i < newsrs.rows.length; i++) {
-            newsArray.push(newsrs.rows.item(i));
-            newsArray[i].statusnet_html=Qt.atob(newsArray[i].statusnet_html);
-            newsArray[i].text=Qt.atob(newsArray[i].text);
-            newsArray[i].id=newsArray[i].status_id;
-            newsArray[i]=fetchUsersForNews(database,user,newsArray[i],allcontacts);
-            if (helpernews.attachments!="" && newsArray[i].attachments!==null){newsArray[i].attachments=JSON.parse(Qt.atob(newsArray[i].attachments))};
-        }
-    callback(newsArray)})
-}
-
-function requestFavorites(login,database,contacts,rootwindow,callback){
-    Helperjs.friendicaRequest(login,"/api/favorites",rootwindow, function (obj){
-   //print(obj+JSON.stringify(obj));
-       var news=JSON.parse(obj);
-       var newContacts=findNewContacts(news,contacts);
-      // storeNews(login,database,news,rootwindow,callback)
-      callback(news,newContacts)
-})}
-
-//function favoritesfromdb(database,user,callback){
-//    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-//    db.transaction( function(tx) {
-//        //print('select * from news WHERE username="'+user+'" AND favorited=1 ORDER BY status_id DESC');
-//        var newsrs=tx.executeSql('select * from news WHERE username="'+user+'" AND favorited=1 ORDER BY status_id DESC');
-//        var newsArray=[];
-//        var allcontacts=getAllContacts(database,user);
-//        for(var i = 0; i < newsrs.rows.length; i++) {
-//            newsArray.push(newsrs.rows.item(i));
-//            newsArray[i].statusnet_html=Qt.atob(newsArray[i].statusnet_html);
-//            newsArray[i].id=newsArray[i].status_id;
-//            newsArray[i]=fetchUsersForNews(database,user,newsArray[i],allcontacts);
-//            if (newsArray[i].attachments!==null){newsArray[i].attachments=JSON.parse(Qt.atob(newsArray[i].attachments))};
-//            callback(newsArray);
-// }})}
-
-function chatsfromdb(database,login,messagetype,callback,stop_time){
-
-    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-    db.transaction( function(tx) {
-    if (!stop_time){var stop="";
-        try{var rs = tx.executeSql('select created_at from news WHERE username="'+login.username+'" AND messagetype="'+messagetype+'" ORDER BY created_at DESC LIMIT 1');
-        stop="<="+rs.rows.item(0).created_at}catch(e){stop="<99999999999999"}}
-    else{var stop="<"+stop_time}
-    var conversationsrs=tx.executeSql('select DISTINCT statusnet_conversation_id from news WHERE username="'+login.username+'" AND created_at'+stop+' AND messagetype="'+messagetype+'" ORDER BY created_at DESC LIMIT 20'); //+' ORDER BY created_at DESC LIMIT 20');
-    var result = tx.executeSql('SELECT status_id from news WHERE username="'+login.username+'" AND messagetype=0 ORDER BY status_id  DESC LIMIT 1');
-    try{var lastid=result.rows.item(0).status_id;}catch(e){var lastid=0};
-    var conversations=[];
-    for(var i = 0; i < conversationsrs.rows.length; i++) {
-        conversations.push(conversationsrs.rows.item(i).statusnet_conversation_id);
-     }
-    var newsArray=[];
-    var allcontacts=getAllContacts(database,login.username);
-
-    for(var j = 0; j< conversations.length; j++) {
-        var newsrs=tx.executeSql('select * from news WHERE username="'+login.username+'"  AND statusnet_conversation_id="'+conversations[j] +'" AND messagetype="'+messagetype+'" ORDER BY created_at ASC');
-        var helpernews=newsrs.rows.item(0);
-        helpernews.newscount=newsrs.rows.length;
-        helpernews=fetchUsersForNews(database,login.username,helpernews,allcontacts);
-        helpernews.statusnet_html=Qt.atob(helpernews.statusnet_html);
-        helpernews.text=Qt.atob(helpernews.text);
-        helpernews.id=helpernews.status_id;
-        if (helpernews.attachments!="" && helpernews.attachments!==null){helpernews.attachments=JSON.parse(Qt.atob(helpernews.attachments))};
-        newsArray.push(helpernews);
-    }
-    callback(newsArray,lastid);
-})}
-
-
-function allchatsfromdb(database,user,callback){
-    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-    db.transaction( function(tx) {
-//    if (!stop_time){var stop="";
-//        try{var rs = tx.executeSql('select created_at from news WHERE username="'+username+'" ORDER BY created_at DESC LIMIT 1');
-//        stop="<="+rs.rows.item(0).created_at}catch(e){stop="<99999999999999"}}
-//    else{var stop="<"+stop_time}
-     var conversationsrs=tx.executeSql('select DISTINCT statusnet_conversation_id from news WHERE username="'+user+'" ORDER BY created_at DESC'); //+' ORDER BY created_at DESC LIMIT 20');
-    var conversationIds=[];
-    for(var i = 0; i < conversationsrs.rows.length; i++) {
-        conversationIds.push(conversationsrs.rows.item(i).statusnet_conversation_id);
-     }
-    var newsArray=[];
-    var countArray=[];
-    var allcontacts=getAllContacts(database,user);
-    for(var j = 0; j< conversationIds.length; j++) {
-        var newsrs=tx.executeSql('select * from news WHERE username="'+user+'"  AND statusnet_conversation_id="'+conversationIds[j] +'" ORDER BY created_at ASC');
-        var helpernews=newsrs.rows.item(0);
-        //helpernews.newscount=newsrs.rows.length;
-        helpernews=fetchUsersForNews(database,user,helpernews,allcontacts);
-        helpernews.statusnet_html=Qt.atob(helpernews.statusnet_html);
-        helpernews.text=Qt.atob(helpernews.text);
-        helpernews.id=helpernews.status_id;
-        if (helpernews.attachments!="" && helpernews.attachments!==null){helpernews.attachments=JSON.parse(Qt.atob(helpernews.attachments))};
-        newsArray.push(helpernews);
-        countArray.push(newsrs.rows.length)
-    }
-    var conversationsobject=({});
-
-    conversationsobject.conversationIds=conversationIds;
-    conversationsobject.newsArray=newsArray;
-    conversationsobject.countArray=countArray;
-    callback(conversationsobject);
-})}
-
-function oldchatfromdb(database,user,conversationId,lastpost,allcontacts,callback){
-    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-    db.transaction( function(tx) {
-//    var newsArray=[];
-//    var countArray=[];
-    //var allcontacts=getAllContacts(database,user);
-    var newsrs=tx.executeSql('select * from news WHERE username="'+user+'"  AND statusnet_conversation_id="'+conversationId +'" AND status_id<'+lastpost+' ORDER BY created_at ASC');
-    if(newsrs.rows.length>0){var helpernews=newsrs.rows.item(0);
-    var newscount=newsrs.rows.length;
-    helpernews=fetchUsersForNews(database,user,helpernews,allcontacts);
-    helpernews.statusnet_html=Qt.atob(helpernews.statusnet_html);
-    helpernews.text=Qt.atob(helpernews.text);
-    helpernews.id=helpernews.status_id;
-    if (helpernews.attachments!="" && helpernews.attachments!==null){helpernews.attachments=JSON.parse(Qt.atob(helpernews.attachments))};
-    callback(helpernews,newscount);}
-//    var conversationobject={news:helpernews,newscount:newscount};
-//    return conversationobject;
-})}
-
-
-
-
-function getAllContacts(database,user){
-    var allcontacts=[];
-    Helperjs.readData(database,"contacts",user,function(obj){
-        allcontacts=obj;
-        for (var n in allcontacts){
-            allcontacts[n].name=Qt.atob(allcontacts[n].name);
-            allcontacts[n].description=Qt.atob(allcontacts[n].description)
-        }
-    });
-    return allcontacts;
-}
-
-function inArray(list, prop, val) {
-    if (list.length > 0 ) {
-        for (var i in list) {if (list[i][prop] == val) {
-                return true;
-            }
-        }
-    } return false;
-}
-
-function objFromArray(list, prop, val) {
-    if (list.length > 0 ) {
-        for (var i in list) {if (list[i][prop] == val) {
-                return list[i];
-            }
-        }
-    } return false;
-}
-
-function cleanDate(date){
-    var cleanedDate= date.slice(0,3)+", "+date.slice(8,11)+date.slice(4,7)+date.slice(25,30)+date.slice(10,25);
-    return cleanedDate
-}
diff --git a/source-android/js/newsworker.js b/source-android/js/newsworker.js
deleted file mode 100644
index 1be2bda..0000000
--- a/source-android/js/newsworker.js
+++ /dev/null
@@ -1,198 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-function findend (text, startpos) {
-    var indexOf = text.substring(startpos || 0).search(/\s/);
-    return (indexOf >= 0) ? (indexOf + (startpos || 0)) : text.length;
-}
-
-
-WorkerScript.onMessage = function(msg) {
-if(msg.deleteId!==undefined)
-    {msg.model.remove(msg.deleteId);
-     msg.model.sync()
-}
-else{
-    if(msg.method=="refresh"){msg.model.clear()};
-    msg.model.sync()
-    for (var j=0;j<msg.news.length;j++){
-    if (msg.news[j]) {
-        var newsitemobject=msg.news[j];
-        //print("Newsitem"+JSON.stringify(newsitemobject.friendica_owner+" userid: "+newsitemobject.user.id));
-//        if (newsitemobject.messagetype==2){
-//            newsitemobject.user={};
-//            newsitemobject.user.profile_image="";
-//            newsitemobject.user.profile_image_url="";
-//            newsitemobject.user.name="";
-//        }
-        var forumname="";
-        try{if (newsitemobject.messagetype==0&&newsitemobject.hasOwnProperty('friendica_author')&&
-                    ((newsitemobject.friendica_author.url)!=(newsitemobject.user.url))&&((newsitemobject.friendica_author.url)!=null)){
-            print(" Friendica Author "+JSON.stringify(newsitemobject.friendica_author));
-            forumname=" via "+newsitemobject.user.name;
-            newsitemobject.user=newsitemobject.friendica_author;
-        }}catch(e){print("forum name "+e)}
-        var likeText="";var dislikeText="";var attendyesText="";var attendnoText="";var attendmaybeText="";  var self={};
-        try{if (newsitemobject.messagetype==0&&newsitemobject.hasOwnProperty('friendica_activities')){
-           if (newsitemobject.friendica_activities.like.length>0){
-              if (newsitemobject.friendica_activities.like.length==1){likeText= newsitemobject.friendica_activities.like[0].name+" "+ qsTr("likes this.")}
-              else {likeText= newsitemobject.friendica_activities.like.length+" "+ qsTr("like this.")}
-           }
-           if (newsitemobject.friendica_activities.dislike.length>0){
-              if (newsitemobject.friendica_activities.dislike.length==1){dislikeText= newsitemobject.friendica_activities.dislike[0].name+" "+ qsTr("doesn't like this.")}
-              else {dislikeText= newsitemobject.friendica_activities.dislike.length+" "+ qsTr("don't like this.")}
-           }
-           if (newsitemobject.friendica_activities.attendyes.length>0){
-              if (newsitemobject.friendica_activities.attendyes.length==1){attendyesText=newsitemobject.friendica_activities.attendyes[0].name+" "+ qsTr("will attend.")}
-              else {attendyesText= newsitemobject.friendica_activities.attendyes.length+" "+ qsTr("persons will attend.")}
-           }
-           if (newsitemobject.friendica_activities.attendno.length>0){
-              if (newsitemobject.friendica_activities.attendno.length==1){attendnoText= newsitemobject.friendica_activities.attendno[0].name+" "+ qsTr("will not attend.")}
-              else {attendnoText= newsitemobject.friendica_activities.attendno.length+" "+ qsTr("persons will not attend.")}
-           }
-           if (newsitemobject.friendica_activities.attendmaybe.length>0){
-              if (newsitemobject.friendica_activities.attendmaybe.length==1){attendmaybeText= newsitemobject.friendica_activities.attendmaybe[0].name+" "+ qsTr("may attend.")}
-              else {attendmaybeText= newsitemobject.friendica_activities.attendmaybe.length+" "+ qsTr("persons may attend.")}
-           }
-           //var friendica_activities_self=JSON.parse(newsitemobject.friendica_activities_self);
-           if (newsitemobject.hasOwnProperty("friendica_activities_self")){
-           if (newsitemobject.friendica_activities_self.indexOf(3)!=-1){self.attending=qsTr("yes")}
-           if (newsitemobject.friendica_activities_self.indexOf(4)!=-1){self.attending=qsTr("no")}
-           if (newsitemobject.friendica_activities_self.indexOf(5)!=-1){self.attending=qsTr("maybe")}
-           if (newsitemobject.friendica_activities_self.indexOf(1)!=-1){self.liked=1}
-           if (newsitemobject.friendica_activities_self.indexOf(2)!=-1){self.disliked=1}
-          }}} catch(e){print("Activities "+e+ " "+JSON.stringify(newsitemobject.friendica_activities))}
-        var friendica_activities={likeText:likeText,dislikeText:dislikeText,attendyesText:attendyesText,attendnoText:attendnoText,attendmaybeText:attendmaybeText,self:self}
-        var attachmentList=[];
-        var videoformats=["mp4", "avi", "webm","ogg","mp3"]
-        try{if(newsitemobject.attachments){
-            var attachArray=newsitemobject.attachments;
-            for (var image in attachArray){
-                var attachhelper={mimetype:attachArray[image].mimetype}
-                var attachhelperstring=Qt.btoa(attachArray[image].url)
-                var helperstringposition=newsitemobject.statusnet_html.indexOf(attachhelperstring);
-                if (helperstringposition>-1){attachhelper.url=newsitemobject.statusnet_html.substring(newsitemobject.statusnet_html.lastIndexOf("http",helperstringposition),helperstringposition+attachhelperstring.length);
-                    if (attachArray[image].mimetype=="image/jpeg"){attachhelper.url=attachhelper.url+".jpg"}
-                    else if (attachArray[image].mimetype=="image/gif"){attachhelper.url=attachhelper.url+".gif"}
-                    else if (attachArray[image].mimetype=="image/png"){attachhelper.url=attachhelper.url+".png"}
-                }
-                else {attachhelper.url=attachArray[image].url}
-                attachmentList.push(attachhelper)
-                //print("Attachhelper "+attachhelper.url)
-                newsitemobject.statusnet_html=newsitemobject.statusnet_html.replace(attachhelper.url,"")
-                newsitemobject.statusnet_html=newsitemobject.statusnet_html.replace(attachhelper.url.substring(0,attachhelper.url.length-4)+".jpeg","")
-                newsitemobject.statusnet_html=newsitemobject.statusnet_html.replace(attachhelper.url.substring(0,attachhelper.url.length-4),"")
-            }
-          }
-        }catch(e){print("attachment "+e)}
-        for (var format in videoformats){
-            if (newsitemobject.text.indexOf("."+videoformats[format])>-1){
-               var videohelper={mimetype:"video/"+videoformats[format]}
-               var videotext=newsitemobject.text;
-               while (videotext.indexOf("."+videoformats[format])>-1){
-                   var videohelperstringposition=videotext.indexOf("."+videoformats[format]);
-                   videohelper.url=videotext.substring(videotext.lastIndexOf("http",videohelperstringposition),videohelperstringposition+4);
-                   videotext=videotext.substring(videohelperstringposition+4,videotext.length)
-                   if ((attachmentList.length==0) || (attachmentList[attachmentList.length-1].url!=videohelper.url)){attachmentList.push(videohelper)}
-               }
-          }
-        }
-        if (newsitemobject.text.indexOf("/videos/watch/")>-1){
-           var ptvideohelper={mimetype:"video/mp4"}
-           var ptvideotext=newsitemobject.text;
-           while (ptvideotext.indexOf("/videos/watch/")>-1){
-               var ptvideohelperstringposition=ptvideotext.indexOf("/videos/watch/");
-               var ptposend=findend(ptvideotext,ptvideohelperstringposition);
-               if(ptposend==-1){ptposend=ptvideotext.length};
-               ptvideohelper.url=ptvideotext.substring(ptvideotext.lastIndexOf("http",ptvideohelperstringposition),ptposend)+"-480.mp4";
-               ptvideohelper.url=ptvideohelper.url.replace("/videos/watch","/static/webseed");
-               ptvideotext=ptvideotext.substring(ptposend,ptvideotext.length)
-               if ((attachmentList.length==0) || (attachmentList[attachmentList.length-1].url!=ptvideohelper.url)){attachmentList.push(ptvideohelper)}
-           }
-      }
-//      if (newsitemobject.text.indexOf("https://www.youtube.com/watch")>-1){
-//            //print("message "+msg.options.showWebsiteForLinks);
-//           if (msg.options.showYoutube!="false"){
-//               var ythelper={mimetype:"video/youtube"}
-//               var yttext=newsitemobject.text;
-//               while (yttext.indexOf("https://www.youtube.com/watch")>-1){
-//                   var ythelperstringposition=linktext.indexOf("watch?v=");
-//                   var ytposend=findend(yttext,ythelperstringposition);
-//                   ythelper.url=yttext.substring(yttext.lastIndexOf("http",linkhelperstringposition),linkposend);
-//                   linktext=linktext.substring(linkhelperstringposition+5,linktext.length)
-//                   if ((attachmentList.length==0) || (attachmentList[attachmentList.length-1].url!=linkhelper.url)){attachmentList.push(linkhelper)}
-//               }
-//           }
-//      }
-      
-//        if (newsitemobject.text.indexOf(".html")>-1){
-//            //print("message "+msg.options.showWebsiteForLinks);
-//           if (msg.options.showWebsiteForLinks!="false"){
-//               var linkhelper={mimetype:"text/html"}
-//               var linktext=newsitemobject.text;
-//               while (linktext.indexOf(".html")>-1){
-//                   var linkhelperstringposition=linktext.indexOf(".html");
-//                   var linkposend=findend(linktext,linkhelperstringposition);
-//                   linkhelper.url=linktext.substring(linktext.lastIndexOf("http",linkhelperstringposition),linkposend);
-//                   linktext=linktext.substring(linkhelperstringposition+5,linktext.length)
-//                   if ((attachmentList.length==0) || (attachmentList[attachmentList.length-1].url!=linkhelper.url)){attachmentList.push(linkhelper)}
-//               }
-//           }
-//      }
-
-        newsitemobject.attachmentList=attachmentList;
-        var seconds=(msg.currentTime-newsitemobject.created_at)/1000;
-        var timestring="";
-        if (seconds<60) {timestring=seconds+" "+qsTr("seconds") +" "+qsTr("ago");}
-        else if (seconds<90){timestring=Math.round(seconds/60)+" "+qsTr("minute") +" "+qsTr("ago");}
-        else if (seconds<3600){timestring=Math.round(seconds/60)+" "+qsTr("minutes") +" "+qsTr("ago");}
-        else if (seconds<5400){timestring=Math.round(seconds/3600)+" "+qsTr("hour") +" "+qsTr("ago");}
-        else if (seconds<86400){timestring=Math.round(seconds/3600)+" "+qsTr("hours") +" "+qsTr("ago");}
-        else if (seconds<129600){timestring=Math.round(seconds/86400)+" "+qsTr("day") +" "+qsTr("ago");}
-        else if (seconds<3888000){timestring=Math.round(seconds/86400)+" "+qsTr("days") +" "+qsTr("ago");}
-        else if (seconds<5832000){timestring=Math.round(seconds/3888000)+" "+qsTr("month") +" "+qsTr("ago");}
-        else if (seconds<69984000){timestring=Math.round(seconds/3888000)+" "+qsTr("months") +" "+qsTr("ago");}
-        else {timestring=Math.round(seconds/46656000)+" "+qsTr("years") +" "+qsTr("ago");}
-
-        var data=({"newsitemobject": newsitemobject,"dateDiff":timestring,"friendica_activities":friendica_activities,"forumname":forumname})}
-        //print("News:"+j+msg.news.length+JSON.stringify(data));
-        if(msg.method=="append") {
-            msg.model.insert(j, data)}
-        else{
-            msg.model.append(data)}
-    }
-    
-    if (j==msg.news.length){
-        //print("j: "+j+" msg.model.count: "+msg.model.count);
-        msg.model.sync()
-    }
-}
-}
diff --git a/source-android/js/photoworker.js b/source-android/js/photoworker.js
deleted file mode 100644
index 029c78e..0000000
--- a/source-android/js/photoworker.js
+++ /dev/null
@@ -1,47 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-WorkerScript.onMessage = function(msg) {
-    if (msg.firstalbum==0){msg.model.clear();}
-    var contact={}; try{contact=msg.friend}catch(e){print(e)}
-   var limit=0; if (msg.albums.length-msg.firstalbum<20){limit=msg.albums.length} else{limit=msg.firstalbum+20}
-    for (var j=msg.firstalbum;j<limit;j++){
-    if (msg.albums[msg.firstalbum]) {
- //       print("album"+msg.albums[j].name);
-        if(msg.foreignPicture){
-            var albumname=msg.albums[j].name.trim();var albumlink=msg.albums[j].link
-        }else{
-            var albumname=msg.albums[j].toString();var albumlink=""}
-        msg.model.append({"albumlink":albumlink,"foreignPicture":msg.foreignPicture,"albumname":albumname,"friend":contact});
-    msg.model.sync()
-    };
- }
-}
diff --git a/source-android/js/service.js b/source-android/js/service.js
deleted file mode 100644
index 3b9588c..0000000
--- a/source-android/js/service.js
+++ /dev/null
@@ -1,618 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-//.pragma library
-.import QtQuick.LocalStorage 2.0 as Sql
-.import "qrc:/js/helper.js" as Helperjs
-.import "qrc:/js/news.js" as Newsjs
-
-// CONFIG FUNCTIONS
-
-function initDatabase(database) { // initialize the database object
-    var db =Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-    //print('initDatabase()'+database[0]+database[1]+database[2]+database[3])
-    db.transaction( function(tx) {
-        //var version=tx.executeSql('PRAGMA user_version');print(JSON.stringify(version.rows.item(0)))
-        tx.executeSql('CREATE TABLE IF NOT EXISTS imageData(username TEXT,id INT, created TEXT,edited TEXT, title TEXT, desc TEXT, album TEXT,filename TEXT, type TEXT, height INT, width INT, profile INT, link TEXT,location TEXT)');
-        tx.executeSql('CREATE TABLE IF NOT EXISTS config(server TEXT, username TEXT, password TEXT, imagestore TEXT, maxnews INT, timerInterval INT, newsViewType TEXT,isActive INT, permissions TEXT,maxContactAge INT,APIVersion TEXT,layout TEXT, addons TEXT)');
-        tx.executeSql('CREATE TABLE IF NOT EXISTS news(username TEXT, messagetype INT, text TEXT, created_at INT, in_reply_to_status_id INT, source TEXT, status_id INT, in_reply_to_user_id INT, geo TEXT,favorited TEXT, uid INT, statusnet_html TEXT, statusnet_conversation_id TEXT,friendica_activities TEXT, friendica_activities_self TEXT, attachments TEXT, friendica_owner TEXT)');
-        tx.executeSql('CREATE TABLE IF NOT EXISTS contacts(username TEXT, id INT, name TEXT, screen_name TEXT, location TEXT,imageAge INT, profile_image_url TEXT, description TEXT, profile_image BLOB, url TEXT, protected TEXT, followers_count INT, friends_count INT, created_at INT, favourites_count TEXT, utc_offset TEXT, time_zone TEXT, statuses_count INT, following TEXT, verified TEXT, statusnet_blocking TEXT, notifications TEXT, statusnet_profile_url TEXT, cid INT, network TEXT, isFriend INT, timestamp INT)');
-//        tx.executeSql('CREATE INDEX IF NOT EXISTS  contact_id ON contacts(id)');
-           tx.executeSql('CREATE TABLE IF NOT EXISTS profiles(username TEXT, id INT, profiledata TEXT)');
-        tx.executeSql('CREATE TABLE IF NOT EXISTS groups(username TEXT, groupname TEXT, gid INT, members TEXT)');
-        tx.executeSql('CREATE TABLE IF NOT EXISTS events(username TEXT, id INT, start INT, end INT, allday INT, title TEXT, j INT, d TEXT, isFirst INT, uid INT, cid INT, uri TEXT, created INT, edited INT, desc TEXT, location TEXT, type TEXT, nofinish TEXT, adjust INT, ignore INT, permissions TEXT, guid INT, itemid INT, plink TEXT, authorName TEXT, authorAvatar TEXT, authorLink TEXT, html TEXT)');
-        tx.executeSql('CREATE TABLE IF NOT EXISTS globaloptions(k TEXT, v TEXT)')
-})}
-
-function cleanPermissions(oldperms){
-    var newperms=oldperms.replace("<","");newperms=newperms.replace(">","");newperms="["+newperms+"]";
-    var newpermArray=JSON.parse(newperms);
-return (newpermArray)
-}
-
-function getEvents(database,login,rootwindow,callback){
-var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-    Helperjs.friendicaWebRequest(login.server+"/cal/"+login.username+"/json",rootwindow,function(obj){
-    //Helperjs.friendicaRemoteAuthRequest(login,login.server+"/cal/"+login.username+"/json",login.server+"/profile/"+login.username,rootwindow,function(obj){
-    var events = JSON.parse(obj);
-    db.transaction( function(tx) {
-    for (var i=0;i<events.length;i++){
-    var permissions=[];
-    permissions.push(cleanPermissions(events[i].item.allow_cid));
-    permissions.push(cleanPermissions(events[i].item.allow_gid));
-    permissions.push(cleanPermissions(events[i].item.deny_cid));
-    permissions.push(cleanPermissions(events[i].item.deny_gid));
-    var result = tx.executeSql('SELECT * from events where username="'+login.username+'" AND id = '+events[i].id); // check for news id
-    if(result.rows.length === 1) {// use update
-        result = tx.executeSql('UPDATE events SET username="'+login.username+'", start="'+Date.parse(events[i].start)+'", end="'+Date.parse(events[i].end)+'", allday="'+Number(events[i].allday)+'", title="'+events[i].title+'", j="'+events[i].j+'", d="'+events[i].d+ '", isFirst="'+Number(events[i].isFirst)+'", uid="'+events[i].item.uid+'", cid="'+events[i].item.cid+'", uri="'+events[i].item.uri+'", created="'+ Date.parse(events[i].item.created)+'", edited="'+ Date.parse(events[i].item.edited)+'", desc="'+events[i].item.desc+'", location="'+events[i].item.location+'", type="'+events[i].item.type+'", nofinish="'+events[i].item.nofinish+'", adjust ="'+events[i].item.adjust+'", ignore="'+events[i].item.ignore+'", permissions="'+ JSON.stringify(permissions)+'", guid="'+events[i].item.guid+'", itemid="'+events[i].item.itemid+  '", plink="'+events[i].item.plink+  '", authorName="'+events[i].item["author-name"]+ '", authorAvatar="'+events[i].item["author-avatar"]+ '", authorLink="'+events[i].item["author-link"]+ '", html="'+Qt.btoa(events[i].html)+'" where username="'+login.username+'" AND id='+events[i].id);
-    } else {// use insert
-        result = tx.executeSql('INSERT INTO events (username,id,start,end,allday,title,j,d,isFirst,uid,cid,uri,created,edited,desc,location,type,nofinish,adjust,ignore,permissions,guid,itemid,plink,authorName,authorAvatar,authorLink,html) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)', [login.username, events[i].id, Date.parse(events[i].start), Date.parse(events[i].end), events[i].allday, events[i].title, events[i].j, events[i].d, events[i].isFirst, events[i].item.uid, events[i].item.cid, events[i].item.uri, Date.parse(events[i].item.created), Date.parse(events[i].item.edited), events[i].item.desc, events[i].item.location, events[i].item.type, events[i].item.nofinish, events[i].item.adjust, events[i].item.ignore, JSON.stringify(permissions), events[i].item.guid, events[i].item.itemid, events[i].item.plink, events[i].item["author-name"], events[i].item["author-avatar"], events[i].item["author-link"], Qt.btoa(events[i].html)])}
-    callback()
-    }
-})})}
-
-function newscount(database, callback){
-    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-     db.transaction( function(tx) {
-            var newscountrs = tx.executeSql('SELECT COUNT(*) from news');
-            var newscount = newscountrs.rows.item(0)["COUNT(*)"];
-            callback(newscount)
-    })
-}
-
-function eventsfromdb(database, username,callback){
-var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-    db.transaction( function(tx) {
-    var eventrs=tx.executeSql('select * from events WHERE username="'+username+'" ORDER BY start ASC');
-    var eventArray=[];
-    var dayArray=[];
-    for(var i = 0; i < eventrs.rows.length; i++) {
-        eventArray.push(eventrs.rows.item(i));
-       // eventArray[i]=fetchUsersForNews(database,username,newsArray[i])
-        dayArray.push(Math.floor(eventrs.rows.item(i).start/86400000));
-    }
-    callback(eventArray,dayArray)});
-}
-
-function requestFriendsEvents(login,friend,rootwindow,callback){
-// get calendar JSON  object of contact without user and password
-    Helperjs.friendicaWebRequest(friend.replace("profile","cal")+"/json",rootwindow,function(calhtml){
-    //print(calhtml);
-    var eventarray=[];var eventdays=[];
-    var events=JSON.parse(calhtml);
-    for (var i=0;i<events.length;i++){
-        var permissions=[];
-        permissions.push(cleanPermissions(events[i].item.allow_cid));
-        permissions.push(cleanPermissions(events[i].item.allow_gid));
-        permissions.push(cleanPermissions(events[i].item.deny_cid));
-        permissions.push(cleanPermissions(events[i].item.deny_gid));
-    
-        var event ={}
-        event.start=Date.parse(events[i].start);event.end=Date.parse(events[i].end);
-        event.allday=events[i].allday; event.title=events[i].title; event.j=events[i].j;
-        event.d=events[i].d; event.isFirst=events[i].isFirst; event.uid=events[i].item.uid;
-        event.cid=events[i].item.cid; event.uri=events[i].item.uri;
-        event.created=Date.parse(events[i].item.created); event.edited=Date.parse(events[i].item.edited);
-        event.desc=events[i].item.desc; event.location=events[i].item.location; event.type=events[i].item.type;
-        event.nofinish=events[i].item.nofinish; event.adjust =events[i].item.adjust; event.ignore=events[i].item.ignore;
-        event.permissions=JSON.stringify(permissions); event.guid=events[i].item.guid;
-        event.itemid=events[i].item.itemid; event.plink=events[i].plink; event.authorName=events[i].item["author-name"];
-        event.authorAvatar=events[i].item["author-avatar"]; event. authorLink=events[i].item["author-link"];
-        event.html=Qt.btoa(events[i].html);
-        eventarray.push(event);
-//        var offsetTime = new Date().getTimezoneOffset() * 60 * 1000;print(new Date(event.start).toLocaleString()+"Zeitverschiebung:"+offsetTime)
-//        var time = event.start - offsetTime;
-        eventdays.push(Math.floor(event.start/(24*60*60*1000)))
-    }
-    //print(JSON.stringify(eventarray));
-    callback(eventarray,eventdays)
- })
-}
-
-function newRequestFriendsEvents(login,friend,rootwindow,callback){
-// get calendar JSON  object of contact with remoteAuth or without user and password
-    if(friend.isFriend==1){
-        Helperjs.friendicaRemoteAuthRequest(login,friend.url.replace("profile","cal")+"/json",friend.url,rootwindow,function(calhtml){
-            getEventsFromHtml(calhtml,rootwindow,callback)})
-    }
-    else{
-        Helperjs.friendicaWebRequest(friend.url.replace("profile","cal")+"/json",rootwindow,function(calhtml){
-            getEventsFromHtml(calhtml,rootwindow,callback)})
-    }
-}
-
-function getEventsFromHtml(calhtml,rootwindow,callback){
-    var eventarray=[];var eventdays=[];
-    var events=JSON.parse(calhtml);
-    for (var i=0;i<events.length;i++){
-        var permissions=[];
-        permissions.push(cleanPermissions(events[i].item.allow_cid));
-        permissions.push(cleanPermissions(events[i].item.allow_gid));
-        permissions.push(cleanPermissions(events[i].item.deny_cid));
-        permissions.push(cleanPermissions(events[i].item.deny_gid));
-
-        var event ={}
-        event.start=Date.parse(events[i].start);event.end=Date.parse(events[i].end);
-        event.allday=events[i].allday; event.title=events[i].title; event.j=events[i].j;
-        event.d=events[i].d; event.isFirst=events[i].isFirst; event.uid=events[i].item.uid;
-        event.cid=events[i].item.cid; event.uri=events[i].item.uri;
-        event.created=Date.parse(events[i].item.created); event.edited=Date.parse(events[i].item.edited);
-        event.desc=events[i].item.desc; event.location=events[i].item.location; event.type=events[i].item.type;
-        event.nofinish=events[i].item.nofinish; event.adjust =events[i].item.adjust; event.ignore=events[i].item.ignore;
-        event.permissions=JSON.stringify(permissions); event.guid=events[i].item.guid;
-        event.itemid=events[i].item.itemid; event.plink=events[i].plink; event.authorName=events[i].item["author-name"];
-        event.authorAvatar=events[i].item["author-avatar"]; event. authorLink=events[i].item["author-link"];
-        event.html=Qt.btoa(events[i].html);
-        eventarray.push(event);
-//        var offsetTime = new Date().getTimezoneOffset() * 60 * 1000;print(new Date(event.start).toLocaleString()+"Zeitverschiebung:"+offsetTime)
-//        var time = event.start - offsetTime;
-        eventdays.push(Math.floor(event.start/(24*60*60*1000)))
-    }
-    //print(JSON.stringify(eventarray));
-    callback(eventarray,eventdays)
-}
-
-function savePermissions(database,obj) { // stores config to DB
- var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
- var permissions=JSON.stringify(obj)
- db.transaction( function(tx) {
-    var result = tx.executeSql( 'UPDATE config SET permissions="'+permissions+'" WHERE username="'+obj.username +'"');
-})
-}
-
-function storeConfig(database,obj) { // stores config to DB
- var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
- db.transaction( function(tx) {
-     //print(JSON.stringify(obj));
-     var result = tx.executeSql('SELECT * from config WHERE username="'+obj.username+'"');
-     if(result.rows.length === 1) {// use update
-        var result2 = tx.executeSql('UPDATE config SET server="'+obj.server+'",password="'+obj.password+'", imagestore="'+obj.imagestore+'", maxnews=0,  timerInterval=0, newsViewType="'+obj.newsViewType+'", isActive=0 WHERE username="'+obj.username +'"');
-        var result3 = tx.executeSql('UPDATE config SET isActive=1 WHERE username !="'+obj.username +'"');
-      } else {// use insert print('... does not exists, create it')
-        var result2 = tx.executeSql('INSERT INTO config VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)', [obj.server, obj.username, obj.password, obj.imagestore, 0, 0,obj.newsViewType,0,"[[],[],[],[]]",0,"","",""]);
-        var result3 = tx.executeSql('UPDATE config SET isActive=1 WHERE username !="'+obj.username +'"');
-        }
- })}
-
-function showServerConfig(url,rootwindow,callback){//print(url);
-Helperjs.friendicaWebRequest(url+"/api/statusnet/config",rootwindow, function (obj){
-    var serverconfig = JSON.parse(obj);
-    var serverConfigString="import QtQuick 2.0; import QtQuick.Dialogs 1.2; MessageDialog{ visible: true; title:'Server';standardButtons: StandardButton.Ok;text: 'Name: "+serverconfig.site.name+"\nLanguage: "+serverconfig.site.language+
-                        "\nEmail: "+serverconfig.site.email+"\nTimezone: "+serverconfig.site.timezone+"\nClosed: "+serverconfig.site.closed+
-                        "\nText limit: "+serverconfig.site.textlimit+"\nShort Url length: "+serverconfig.site.shorturllength+
-                        "\nFriendica version: "+serverconfig.site.friendica.FRIENDICA_VERSION+"\nDFRN version: "+serverconfig.site.friendica.DFRN_PROTOCOL_VERSION +
-                        "\nDB Update version: "+serverconfig.site.friendica.DB_UPDATE_VERSION+"'}";
-    callback(serverConfigString)
-})}
-
-function checkLogin(login,rootwindow,callback){
-// check server with given credentials
-try {Helperjs.friendicaRequest(login,"/api/account/verify_credentials",rootwindow, function (obj){
-    var account = JSON.parse(obj);
-    callback(account)
-    })}
-    catch(e){}
-}
-
-function requestProfile(login,database,rootwindow,callback){
-//    return profile data
-    Helperjs.friendicaRequest(login,"/api/friendica/profile/show", rootwindow,function (obj){
-        var profiledata=JSON.parse(obj);
-        var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-        for (var i=0;i<profiledata.profiles.length;i++){
-            //print('store profile data for '+JSON.stringify(profiledata.profiles[i]));
-            db.transaction( function(tx) {
-             var result = tx.executeSql('SELECT * from profiles where username="'+login.username+'" AND id = '+profiledata.profiles[i].profile_id); // check for profile id
-             if(result.rows.length === 1) {// use update
-                result = tx.executeSql('UPDATE profiles SET profiledata="'+ Qt.btoa(JSON.stringify(profiledata.profiles[i]))+'" WHERE username="'+login.username+'" AND id='+parseInt(profiledata.profiles[i].profile_id));
-             } else {// use insert
-                result = tx.executeSql('INSERT INTO profiles (username,id,profiledata) VALUES (?,?,?)', [login.username,profiledata.profiles[i].profile_id,Qt.btoa(JSON.stringify(profiledata.profiles[i]))])}
-             });
-        }
-        var profile=profiledata.friendica_owner;
-        profile.isFriend=2;
-        var profilearray=[];profilearray.push(profile);
-        callback(profilearray)
-    });
-}
-
-function getServerConfig(database,login,rootwindow,callback){
-// check server with given credentials
-try {Helperjs.friendicaRequest(login,"/api/statusnet/config",rootwindow, function (obj){
-    var serverconfig = JSON.parse(obj);
-    var serverconfigString="import QtQuick 2.0; import QtQuick.Dialogs 1.2; MessageDialog{ visible: true; title:'Server';standardButtons: StandardButton.Ok;text: 'SUCCESS! \nName: "+serverconfig.site.name+"\nLanguage: "+serverconfig.site.language+
-                        "\nEmail: "+serverconfig.site.email+"\nTimezone: "+serverconfig.site.timezone+"\nClosed: "+serverconfig.site.closed+
-                        "\nText limit: "+serverconfig.site.textlimit+"\nShort Url length: "+serverconfig.site.shorturllength+
-                        "\nFriendica version: "+serverconfig.site.friendica.FRIENDICA_VERSION+"\nDFRN version: "+serverconfig.site.friendica.DFRN_PROTOCOL_VERSION +
-                        "\nDB Update version: "+serverconfig.site.friendica.DB_UPDATE_VERSION+"'}";
-
-    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-                db.transaction( function(tx) {
-                    var result = tx.executeSql('UPDATE config SET APIVersion="'+ serverconfig.site.friendica.FRIENDICA_VERSION+'"   WHERE username="'+login.username +'"')})
-
-//    Helperjs.friendicaRequest(login,"/friendica/json",rootwindow, function (obj){
-//    var serverData = JSON.parse(obj);var serverAddons=JSON.stringify(serverData.plugins).replace(/"/g,"");
-//    db.transaction( function(tx) {
-//                    var result = tx.executeSql('UPDATE config SET addons="'+ serverAddons+'" WHERE username="'+login.username +'"')})
-
-//    })
-     callback(serverconfigString);
-    })}
-    catch (e){callback (e);
-}}
-
-function readConfig(database,callback,filter,filtervalue) { // reads config
-    if (filter){var where = " WHERE "+ filter +" = '" + filtervalue+"'"} else { var where=""}
-    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3],initDatabase(database));
-    db.transaction( function(tx) {
-        var tables = tx.executeSql("SELECT * FROM sqlite_master WHERE type='table'");
-        if (tables.rows.length==0){print("no database");callback("")} else {
-        var rs = tx.executeSql('select * from config'+where);
-        var rsArray=[];
-        if (rs.rows.length>0){
-            for(var i = 0; i < rs.rows.length; i++) {
-                rsArray.push(rs.rows.item(i))
-            }
-        var rsObject={server:rsArray[0].server,username:rsArray[0].username, password:rsArray[0].password,imagestore:rsArray[0].imagestore,isActive:rsArray[0].isActive, newsViewType:rsArray[0].newsViewType,permissions:JSON.parse(rsArray[0].permissions),maxContactAge:rsArray[0].maxContactAge,APIVersion:rsArray[0].APIVersion,addons:rsArray[0].addons};
-            } else {var rsObject=""}
-        callback(rsObject)}}
-    )
-}
-
-function readActiveConfig(database){
-  var obj;
-  readConfig(database,function(config){obj=config},"isActive", 0);
-  return obj;
-}
-
-function readGlobaloptions(database,callback){
-    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-    var go=({});
-    db.transaction( function(tx) {
-        var rs = tx.executeSql('select * from globaloptions');
-        for (var r=0; r<rs.rows.length; r++){
-            go[rs.rows.item(r).k]=rs.rows.item(r).v
-        }
-        callback(go)
-    })
-
-}
-
-function updateglobaloptions(database,key,value){
-    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-    db.transaction( function(tx) {
-        var result = tx.executeSql('SELECT * from globaloptions where k="'+key+'"'); // check for key
-        if(result.rows.length === 1) {// use update
-            result = tx.executeSql('UPDATE globaloptions SET v="'+value+'" WHERE k="'+key+'"')
-        } else {// use insert
-                result = tx.executeSql('INSERT INTO globaloptions (k,v) VALUES (?,?)', [key,value])
-        }
-    })
-    root.globaloptions[key]=value;
- }
-
-function deleteConfig(database,userobj,callback) { // delete user data from DB
-    if (userobj){var where = " WHERE username='"+ userobj.username+"' and server='"+userobj.server+"'";} else { return "no user selected!";}
-    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-    if(!db) { return; }
-    db.transaction( function(tx) {
-        var rs1 = tx.executeSql('delete from config'+where);
-        var rs2 = tx.executeSql("delete from news WHERE username='"+ userobj.username+"'");
-        var rs3 = tx.executeSql("delete from contacts WHERE username='"+ userobj.username+"'");
-        var rs4 = tx.executeSql("delete from imageData WHERE username='"+ userobj.username+"'");
-        var rs5 = tx.executeSql("delete from groups WHERE username='"+ userobj.username+"'");
-        var rs5 = tx.executeSql("delete from events WHERE username='"+ userobj.username+"'");
-    callback();
-    })
-}
-
-function  cleanNews(database,callback){
-     var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-      db.transaction( function(tx) {
-             //var maxnewsrs = tx.executeSql("SELECT DISTINCT maxnews FROM config");
-             var maxnewsrs = tx.executeSql("SELECT v FROM globaloptions WHERE k='max_news'");
-          var maxnews=1000; if(maxnewsrs.rows.length>0){ maxnews=maxnewsrs.rows.item(0).v};
-             var newscountrs = tx.executeSql('SELECT COUNT(*) from news');
-             var newscount = newscountrs.rows.item(0)["COUNT(*)"];//print("newscount "+newscount)
-             if (newscount>maxnews){
-                 var lastvalidtimers= tx.executeSql('SELECT DISTINCT created_at FROM news ORDER BY created_at ASC LIMIT ' +(newscount-maxnews));
-                 var lastvalidtime=lastvalidtimers.rows.item(newscount-maxnews-1).created_at;
-                 var deleters = tx.executeSql('DELETE from news WHERE created_at<='+lastvalidtime)}
-             callback()
-     })
- }
-
-function cleanContacts(login,database,callback){
-    var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-    db.transaction( function(tx) {
-        var oldestnewsrs= tx.executeSql('SELECT created_at FROM news WHERE username="'+login.username+'" AND messagetype=0 ORDER BY created_at ASC LIMIT 1');
-        if (oldestnewsrs.rows.length>0){ var oldestnewsTime=oldestnewsrs.rows.item(0).created_at-  604800000;} else{var oldestnewsTime=0}  //contacts can be 7 days old
-        //print(login.username+" älteste news: "+ oldestnewsTime);
-        var result = tx.executeSql('SELECT * from contacts WHERE username="'+login.username+'" AND isFriend=0 AND imageAge<'+oldestnewsTime); // check for friends
-        //print ("Contact result length: "+ result.rows.length)
-        for (var i=0;i<result.rows.length;i++){
-            filesystem.rmFile(result.rows.item(i).profile_image);
-            var deleters = tx.executeSql('DELETE from contacts WHERE username="'+login.username+'" AND url="'+result.rows.item(i).url+'"');
-        }
-        callback()
-    })
-}
-
-function updateContactInDB(login,database,isFriend,contact){// for newstab and friendstab
-    var currentTime=Date.now();
-    var image_timestamp=0;
-        var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-        db.transaction( function(tx) {
-            var imagename_helper=[];
-            imagename_helper=contact.profile_image_url.split('?');//print("substring: "+JSON.stringify(imagename_helper)+imagename_helper[0].substring(imagename_helper[0].lastIndexOf("/")+1, imagename_helper[0].length))
-            try {parseInt(image_timestamp=imagename_helper[1].substring(imagename_helper[1].indexOf("ts=")+3,imagename_helper[1].length))} catch(e){};
-        var result;
-        result = tx.executeSql('SELECT * from contacts where username="'+login.username+'" AND url = "'+contact.url+'"'); // check for news url
-        if(result.rows.length === 1) {// use update
-            result = tx.executeSql('UPDATE contacts SET  id='+contact.id+', name="'+Qt.btoa(contact.name)+'", screen_name="'+contact.screen_name+'", location="'+contact.location+'",imageAge='+currentTime+', profile_image_url="'+contact.profile_image_url+'", description="'+Qt.btoa(contact.description)+'", protected="'+contact.protected+'", followers_count='+contact.followers_count+', friends_count='+contact.friends_count+', created_at="'+ contact.created_at+'", favourites_count="'+contact.favorites_count+'", utc_offset="'+contact.utc_offset+'", time_zone="'+contact.time_zone+'", statuses_count='+contact.statuses_count+', following="'+contact.following+'", verified ="'+contact.verified+'", statusnet_blocking="'+contact.statusnet_blocking+'", notifications="'+contact.notifictions+'", statusnet_profile_url="'+contact.statusnet_profile_url+'", cid='+contact.cid+', network="'+contact.network+'", isFriend='+isFriend+', timestamp='+ currentTime+' where username="'+login.username+'" AND  url="'+contact.url+'"');
-        } else {// use insert
-        result = tx.executeSql('INSERT INTO contacts VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)', [login.username,contact.id,Qt.btoa(contact.name),contact.screen_name,contact.location,currentTime,contact.profile_image_url, Qt.btoa(contact.description),"",contact.url,contact.protected,contact.followers_count, contact.friends_count,contact.created_at,contact.favorites_count,contact.utc_offset,contact.time_zone,contact.statuses_count,contact.following,contact.verfied,contact.statusnet_blocking,contact.notifications,contact.statusnet_profile_url,contact.cid,contact.network,isFriend,image_timestamp]);}
-    });
-}
-
-function processNews(api,data){
-    //print(api + data);
-    try{var newslist=JSON.parse(data)} catch(e){newsBusy.running=false;};
-    if (data==""){}
-    else if (typeof(newslist)=='undefined'){
-            Helperjs.showMessage(qsTr("Undefined Array Error"),"API:\n" +login.server+api+"\n Return: \n"+data,root)
-        }
-    else if (newslist.hasOwnProperty('status')){
-        Helperjs.showMessage(qsTr("JSON status Error"),"API:\n" +login.server+api+"\n Return: \n"+data,root)
-    }
-    else if (!(Array.isArray(newslist))){
-        //print("processNews not array"+newslist+JSON.stringify(newslist));
-        replytimer.restart()
-    }
-    else {
-        var allcontacts=[];
-        allcontacts=Newsjs.getAllContacts(db,login.username);
-        if (api=="/api/direct_messages/all"){
-            for (var n in newslist){
-                newslist[n].created_at=Date.parse(Newsjs.cleanDate(newslist[n].created_at));
-                newslist[n].messagetype=1;
-                newslist[n].source=" Friendica";
-                newslist[n].status_id=newslist[n].id;
-                newslist[n].uid=newslist[n].sender.id;
-                newslist[n].statusnet_conversation_id=newslist[n].friendica_parent_uri;
-                newslist[n].user=cleanUser(newslist[n].sender);
-                newslist[n].friendica_owner=newslist[n].user;
-                newslist[n].friendica_author=newslist[n].user;
-                newslist[n].statusnet_html=newslist[n].text;
-        }}
-        else if (api=="/api/friendica/notifications"){
-            for (var n in newslist){
-                newslist[n].created_at=Date.parse(newslist[n].date);
-                newslist[n].messagetype=2;
-                newslist[n].user=Newsjs.objFromArray(allcontacts,"url",newslist[n].url)
-                if (newslist[n].user==false){
-                    newslist[n].user={"profile_image_url": newslist[n].photo,"name": newslist[n].name," url":newslist[n].url, "created_at":newslist[n].date};
-                    newslist[n].user=cleanUser(newslist[n].user);
-                }
-                newslist[n].friendica_author=newslist[n].user;
-                newslist[n].friendica_owner=newslist[n].user;
-                newslist[n].statusnet_html=newslist[n].msg_html;
-                newslist[n].text=newslist[n].msg;
-            }
-        } else {//if(api!="/api/statuses/user_timeline"){
-            var chatlist=[];
-            var conversationIds=[];
-            var commentCount=[];
-            for (var n in newslist){
-                newslist[n].created_at=Date.parse(Newsjs.cleanDate(newslist[n].created_at));
-                if (api=="/api/statuses/replies"){newslist[n].messagetype=3}else{newslist[n].messagetype=0;}
-                newslist[n].friendica_author=cleanUser(newslist[n].friendica_author);
-                newslist[n].user=cleanUser(newslist[n].user);
-                if(newslist[n].in_reply_to_user_id){newslist[n].reply_user=Newsjs.objFromArray(allcontacts,"id",newslist[n].in_reply_to_user_id)}
-                //print (JSON.stringify(newslist[n].user))
-                if(newslist[n].hasOwnProperty('friendica_activities')){
-                    for (var m in newslist[n].friendica_activities.like){
-                            newslist[n].friendica_activities.like[m]=cleanUser(newslist[n].friendica_activities.like[m]);
-                        }
-                    for (var o in newslist[n].friendica_activities.dislike){
-                            newslist[n].friendica_activities.dislike[o]=cleanUser(newslist[n].friendica_activities.dislike[o]);
-                        }
-                    for (var p in newslist[n].friendica_activities.attendyes){
-                            newslist[n].friendica_activities.attendyes[p]=cleanUser(newslist[n].friendica_activities.attendyes[p]);
-                        }
-                    for (var q in newslist[n].friendica_activities.attendno){
-                            newslist[n].friendica_activities.attendno[q]=cleanUser(newslist[n].friendica_activities.attendno[q]);
-                        }
-                    for (var r in newslist[n].friendica_activities.attendmaybe){
-                            newslist[n].friendica_activities.attendmaybe[r]=cleanUser(newslist[n].friendica_activities.attendmaybe[r]);
-                        }
-                }
-                if(!(newslist[n].hasOwnProperty('friendica_author'))){
-                    newslist[n].friendica_author=newslist[n].user
-                }
-                var conversationindex=conversationIds.indexOf(newslist[n].statusnet_conversation_id);
-
-                //fill chatlist
-                if (conversationindex==-1){
-                    chatlist.push(newslist[n]);
-                    conversationIds.push(newslist[n].statusnet_conversation_id);
-                    commentCount.push(1);
-                } else{
-                    commentCount[conversationindex]=commentCount[conversationindex]+1;
-                    chatlist[conversationindex]=newslist[n];
-                }
-            }
-            //enrich chatlist with old entries
-
-            for (var count in chatlist){ //print("chat "+JSON.stringify(chatlist[count])+" count: "+commentCount[count])
-                //chatlist[count].newscount=commentCount[count]
-                if (chatlist[count].id_str!==chatlist[count].statusnet_conversation_id){
-                    try{
-                        Newsjs.oldchatfromdb(db,login.username,chatlist[count].statusnet_conversation_id,chatlist[count].id,allcontacts,function(oldpost,oldcount){
-                            chatlist[count]=oldpost;
-                            chatlist[count].newscount=oldcount+commentCount[count];
-                            //print("JSON "+chatlist[count].statusnet_conversation_id+"   "+chatlist[count].id+JSON.stringify(oldpost))
-                        })
-                    }catch(e){print(e)}
-                }
-                else{chatlist[count].newscount=commentCount[count]}
-            }
-        }
-
-
-        if (api=="/api/conversation/show"){
-            newslist.reverse();
-            newstab.conversation=newslist
-        }
-        else if (api=="/api/statuses/user_timeline"){
-            newstab.contactposts=newslist
-        }
-        else if ((api!="/api/direct_messages/all")&&(api!="/api/friendica/notifications")&&(newstab.newstabstatus==="Conversations")){
-            showNews(chatlist);root.news=newslist
-        }
-        else {
-            showNews(newslist);root.news=newslist};
-
-        var newstabarray=["Conversations","Favorites","Timeline","DirectMessage","Replies"];
-        if (newstabarray.indexOf(newstab.newstabstatus)>-1){contacttimer.start()}
-    }
-
-}
-
-
-function cleanUser(user){
-    user.created_at=Date.parse(Newsjs.cleanDate(user.created_at));
-    var imagehelper1=user.profile_image_url.split("?");
-    var imagehelper2=imagehelper1[0].substring(imagehelper1[0].lastIndexOf("/")+1,imagehelper1[0].length);
-    var imagehelper3=login.imagestore+"contacts/"+user.screen_name+"-"+imagehelper2
-    if(filesystem.fileexist(imagehelper3)){user.profile_image=imagehelper3}else {user.profile_image=""}
-    return user
-}
-
-function updateView(viewtype){
-    //messageSend.state="";
-    //newsBusy.running=true;
-    //downloadNotice.text="xhr start "+Date.now()
-    switch(viewtype){
-        case "Conversations":
-            Newsjs.getLastNews(login,db,function(lastnews){
-                xhr.setLogin(login.username+":"+Qt.atob(login.password));
-                xhr.setUrl(login.server);
-                xhr.setApi("/api/statuses/friends_timeline");
-                xhr.clearParams();
-                xhr.setParam("since_id",lastnews);
-                xhr.setParam("count",50)});
-            break;
-        case "Timeline":
-            var lastnews=Newsjs.getLastNews(login,db,function(lastnews){
-                xhr.setLogin(login.username+":"+Qt.atob(login.password));
-                xhr.setUrl(login.server);
-                xhr.setApi("/api/statuses/friends_timeline");
-                xhr.clearParams();
-                xhr.setParam("since_id",lastnews);
-                xhr.setParam("count",50)
-            });
-            break;
-        case "Search":
-            xhr.setLogin(login.username+":"+Qt.atob(login.password));
-            xhr.setUrl(login.server);
-            xhr.setApi("/api/search");
-            break;
-        case "Notifications":
-            xhr.setLogin(login.username+":"+Qt.atob(login.password));
-            xhr.setUrl(login.server);
-            xhr.setApi("/api/friendica/notifications");
-            xhr.clearParams();
-            break;
-        case "Direct Messages":
-            xhr.setLogin(login.username+":"+Qt.atob(login.password));
-            xhr.setUrl(login.server);
-            xhr.setApi("/api/direct_messages/all");
-            xhr.clearParams();
-            break;
-        case "Public Timeline":
-            xhr.setLogin(login.username+":"+Qt.atob(login.password));
-            xhr.setUrl(login.server);
-            xhr.setApi("/api/statuses/public_timeline");
-            xhr.clearParams();
-            break;
-        case "Favorites":
-            xhr.setLogin(login.username+":"+Qt.atob(login.password));
-            xhr.setUrl(login.server);
-            xhr.setApi("/api/favorites");
-            xhr.clearParams();
-            break;
-        case "Replies":
-            xhr.setLogin(login.username+":"+Qt.atob(login.password));
-            xhr.setUrl(login.server);
-            xhr.setApi("/api/statuses/replies");
-            xhr.clearParams();
-            break;
-        default:
-            Newsjs.getLastNews(login,db,function(lastnews){
-                xhr.setLogin(login.username+":"+Qt.atob(login.password));
-                xhr.setUrl(login.server);
-                xhr.setApi("/api/statuses/friends_timeline");
-                xhr.clearParams();
-                xhr.setParam("since_id",lastnews);
-                xhr.setParam("count",50)
-                newstab.newstabstatus="Conversations";
-            });
-    }
-
-    xhr.get();
-    if (viewtype==="Conversations"){Newsjs.allchatsfromdb(db,login.username,function(temp){
-        newsStack.allchats=temp
-    })}
-}
-
-function showGroups(){
-    Helperjs.readData(db,"groups",login.username,function(groups){
-        var groupitems="";
-            for (var i=0;i<groups.length;i++){
-                groupitems=groupitems+"MenuItem{text:'"+groups[i].groupname+"'; onTriggered: Service.getGroupnews("+groups[i].gid+")}"
-            }
-            var menuString="import QtQuick.Controls 1.4; import 'qrc:/js/service.js' as Service; Menu {"+groupitems+"}";
-            var grouplistObject=Qt.createQmlObject(menuString,newsStack,"groupmenuOutput");
-            grouplistObject.popup()
-    })
-}
-
-function getGroupnews(list){
-    newstab.newstabstatus="Group news";
-    newsBusy.running=true;
-    xhr.setLogin(login.username+":"+Qt.atob(login.password));
-    xhr.setUrl(login.server);
-    xhr.setApi("/api/lists/statuses");
-    xhr.clearParams();
-    xhr.setParam("list_id",list)
-    xhr.get();
-}
diff --git a/source-android/js/smiley.js b/source-android/js/smiley.js
deleted file mode 100644
index 974b3d7..0000000
--- a/source-android/js/smiley.js
+++ /dev/null
@@ -1,631 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-var html=[//Smileys
-            '\u263A',
-            '\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-brokenheart.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-frown.gif'},
-
-{name:':-P',url:
-'qrc:///images/smileys/core/smiley-tongue-out.gif'},
-
-{name:':-X',url:
-'qrc:///images/smileys/core/smiley-kiss.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-thumbsup.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-foot-in-mouth.gif'},
-
-{name:":-/",url:
-'qrc:///images/smileys/core/smiley-undecided.gif'},
-
-{name:":-[",url:
-'qrc:///images/smileys/core/smiley-embarassed.gif'},
-
-{name:"8-)",url:
-'qrc:///images/smileys/core/smiley-cool.gif'},
-
-{name:':beer',url:
-'qrc:///images/smileys/core/beer_mug.gif'},
-
-{name:':coffee',url:
-'qrc:///images/smileys/core/coffee.gif'},
-
-{name:':facepalm',url:
-'qrc:///images/smileys/core/smiley-facepalm.gif'},
-
-{name:':like',url:
-'qrc:///images/smileys/core/like.gif'},
-
-{name:':dislike',url:
-'qrc:///images/smileys/core/dislike.gif'},
-
-{name:'~friendica',url:
-'qrc:///images/smileys/core/friendica-16.png'},
-
-{name:'red#',url:
-'qrc:///images/smileys/core/rm-16.png'}
-]
-
-
-var addon=[
-{name:':bunnyflowers',url:
-'qrc:///images/smileys/animals/bunnyflowers.gif'},
-
- {name:':chick',url:
-'qrc:///images/smileys/animals/chick.gif'},
-
- {name:':bumblebee',url:
-'qrc:///images/smileys/animals/bee.gif'},
-
- {name:':ladybird',url:
-'qrc:///images/smileys/animals/ladybird.gif'},
-
- {name:':bigspider',url:
-'qrc:///images/smileys/animals/bigspider.gif' },
-
- {name:':cat',url:
-'qrc:///images/smileys/animals/cat.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:':dolphin',url:
-'qrc:///images/smileys/animals/dolphin.gif' },
-
- {name:':dragonfly',url:
-'qrc:///images/smileys/animals/dragonfly.gif' },
-
- {name:':frog',url:
-'qrc:///images/smileys/animals/frog.gif'},
-
- {name:':hamster',url:
-'qrc:///images/smileys/animals/hamster.gif' },
-
- {name:':monkey',url:
-'qrc:///images/smileys/animals/monkey.gif' },
-
- {name:':horse',url:
-'qrc:///images/smileys/animals/horse.gif' },
-  
- {name:':parrot',url:
-'qrc:///images/smileys/animals/parrot.gif' },
-
- {name:':tux',url:
-'qrc:///images/smileys/animals/tux.gif' },
-
- {name:':snail',url:
-'qrc:///images/smileys/animals/snail.gif' },
-
- {name:':sheep',url:
-'qrc:///images/smileys/animals/sheep.gif' },
-
- {name:':dog',url:
-'qrc:///images/smileys/animals/dog.gif'},
-
- {name:':elephant',url:
-'qrc:///images/smileys/animals/elephant.gif' },
-
- {name:':fish',url:
-'qrc:///images/smileys/animals/fish.gif' },
-
- {name:':giraffe',url:
-'qrc:///images/smileys/animals/giraffe.gif' },
-
- {name:':pig',url:
-'qrc:///images/smileys/animals/pig.gif'},
-
-//Baby 
-
- {name:':baby',url:
-'qrc:///images/smileys/babies/baby.gif' },
-
- {name:':babycot',url:
-'qrc:///images/smileys/babies/babycot.gif' },
-	
-
- {name:':pregnant',url:
-'qrc:///images/smileys/babies/pregnant.gif' },
-
- {name:':stork',url:
-'qrc:///images/smileys/babies/stork.gif' },
-
-
-//Confused 
- {name:':confused',url:
-'qrc:///images/smileys/confused/confused.gif' },
-    
- {name:':shrug',url:
-'qrc:///images/smileys/confused/shrug.gif' },
-
- {name:':stupid',url:
-'qrc:///images/smileys/confused/stupid.gif' },
-
- {name:':dazed',url:
-'qrc:///images/smileys/confused/dazed.gif' },
-//Cool 'qrc:///images/smileys
-
- {name:':affro',url:
-'qrc:///images/smileys/cool/affro.gif'},
-
-//Devil/Angel 
-
- {name:':angel',url:
-'qrc:///images/smileys/devilangel/angel.gif'},
-
- {name:':cherub',url:
-'qrc:///images/smileys/devilangel/cherub.gif'},
-
- {name:':devilangel',url:
-'qrc:///images/smileys/devilangel/blondedevil.gif' },
- {name:':catdevil',url:
-'qrc:///images/smileys/devilangel/catdevil.gif'},
-
- {name:':devillish',url:
-'qrc:///images/smileys/devilangel/devil.gif'},
-	
- {name:':daseesaw',url:
-'qrc:///images/smileys/devilangel/daseesaw.gif'},
-
- {name:':turnevil',url:
-'qrc:///images/smileys/devilangel/turnevil.gif' },
-	
- {name:':saint',url:
-'qrc:///images/smileys/devilangel/saint.gif'},
-
- {name:':graveside',url:
-'qrc:///images/smileys/devilangel/graveside.gif'},
-
-//Unpleasent 
-
- {name:':toilet',url:
-'qrc:///images/smileys/disgust/toilet.gif'},
-
- {name:':fartinbed',url:
-'qrc:///images/smileys/disgust/fartinbed.gif' },
-
- {name:':fartblush',url:
-'qrc:///images/smileys/disgust/fartblush.gif' },
-
-//Drinks
-
- {name:':tea',url:
-'qrc:///images/smileys/drink/tea.gif' },
-
- {name:':drool',url:
-'qrc:///images/smileys/drool/drool.gif'},
-
-//Sad 
-
- {name:':crying',url:
-'qrc:///images/smileys/sad/crying.png'},
-
- {name:':prisoner',url:
-'qrc:///images/smileys/sad/prisoner.gif' },
-
- {name:':sigh',url:
-'qrc:///images/smileys/sad/sigh.gif'},
-
-//Smoking - only one smiley in here, maybe it needs moving elsewhere?
-
- {name:':smoking',url:
-'qrc:///images/smileys/smoking/smoking.gif'},
-
-//Sport
-
- {name:':basketball',url:
-'qrc:///images/smileys/sport/basketball.gif'},
-
- {name:':bowling',url:
-'qrc:///images/smileys/sport/bowling.gif'},
-
- {name:':cycling',url:
-'qrc:///images/smileys/sport/cycling.gif'},
-
- {name:':darts',url:
-'qrc:///images/smileys/sport/darts.gif'},
-
- {name:':fencing',url:
-'qrc:///images/smileys/sport/fencing.gif' },
-
- {name:':juggling',url:
-'qrc:///images/smileys/sport/juggling.gif'},
-
- {name:':skipping',url:
-'qrc:///images/smileys/sport/skipping.gif'},
-
- {name:':archery',url:
-'qrc:///images/smileys/sport/archery.gif'},
-
- {name:':surfing',url:
-'qrc:///images/smileys/sport/surfing.gif' },
-
- {name:':snooker',url:
-'qrc:///images/smileys/sport/snooker.gif' },
-  
- {name:':horseriding',url:
-'qrc:///images/smileys/sport/horseriding.gif'},
-
-//Love 
-
- {name:':iloveyou',url:
-'qrc:///images/smileys/love/iloveyou.gif'},
-
- {name:':inlove',url:
-'qrc:///images/smileys/love/inlove.gif'},
-
- {name:':~love',url:
-'qrc:///images/smileys/love/love.gif' },
-
- {name:':lovebear',url:
-'qrc:///images/smileys/love/lovebear.gif'},
-
- {name:':lovebed',url:
-'qrc:///images/smileys/love/lovebed.gif' },
-
- {name:':loveheart',url:
-'qrc:///images/smileys/love/loveheart.gif' },
-
-//Tired/Sleep 
-
- {name:':countsheep',url:
-'qrc:///images/smileys/tired/countsheep.gif' },
-
- {name:':hammock',url:
-'qrc:///images/smileys/tired/hammock.gif'},
-
- {name:':pillow',url:
-'qrc:///images/smileys/tired/pillow.gif' },
-
- {name:':yawn',url:
-'qrc:///images/smileys/tired/yawn.gif'},
-
-//Fight/Flame/Violent 
-
- {name:':2guns',url:
-'qrc:///images/smileys/fight/2guns.gif' },
-
- {name:':alienfight',url:
-'qrc:///images/smileys/fight/alienfight.gif' },
-
- {name:':army',url:
-'qrc:///images/smileys/fight/army.gif'},
-
- {name:':arrowhead',url:
-'qrc:///images/smileys/fight/arrowhead.gif'},
-
- {name:':bfg',url:
-'qrc:///images/smileys/fight/bfg.gif' },
-
- {name:':bowman',url:
-'qrc:///images/smileys/fight/bowman.gif' },
-
- {name:':chainsaw',url:
-'qrc:///images/smileys/fight/chainsaw.gif'},
-
- {name:':crossbow',url:
-'qrc:///images/smileys/fight/crossbow.gif'},
-
- {name:':crusader',url:
-'qrc:///images/smileys/fight/crusader.gif' },
-
- {name:':dead',url:
-'qrc:///images/smileys/fight/dead.gif' },
-
- {name:':hammersplat',url:
-'qrc:///images/smileys/fight/hammersplat.gif' },
-
- {name:':lasergun',url:
-'qrc:///images/smileys/fight/lasergun.gif' },
-
- {name:':machinegun',url:
-'qrc:///images/smileys/fight/machinegun.gif' },
-
- {name:':acid',url:
-'qrc:///images/smileys/fight/acid.gif' },
-
-//Fantasy - monsters and dragons fantasy.  The other type of fantasy belongs in adult 
-
- {name:':alienmonster',url:
-'qrc:///images/smileys/fantasy/alienmonster.gif' },
-
- {name:':barbarian',url:
-'qrc:///images/smileys/fantasy/barbarian.gif' },
-
- {name:':dinosaur',url:
-'qrc:///images/smileys/fantasy/dinosaur.gif'},
-
- {name:':dragon',url:
-'qrc:///images/smileys/fantasy/dragon.gif'},
-
- {name:':draco',url:
-'qrc:///images/smileys/fantasy/dragonwhelp.gif'},
-
- {name:':ghost',url:
-'qrc:///images/smileys/fantasy/ghost.gif'},
-
- {name:':mummy',url:
-'qrc:///images/smileys/fantasy/mummy.gif'},
-
-//Food 
-
- {name:':apple',url:
-'qrc:///images/smileys/food/apple.gif' },
-
- {name:':broccoli',url:
-'qrc:///images/smileys/food/broccoli.gif' },
-
- {name:':cake',url:
-'qrc:///images/smileys/food/cake.gif'},
-
- {name:':carrot',url:
-'qrc:///images/smileys/food/carrot.gif' },
-
- {name:':popcorn',url:
-'qrc:///images/smileys/food/popcorn.gif'},
-
- {name:':tomato',url:
-'qrc:///images/smileys/food/tomato.gif'},
-
- {name:':banana',url:
-'qrc:///images/smileys/food/banana.gif'},
-
- {name:':cooking',url:
-'qrc:///images/smileys/food/cooking.gif'},
-
- {name:':fryegg',url:
-'qrc:///images/smileys/food/fryegg.gif'},
-
- {name:':birthdaycake',url:
-'qrc:///images/smileys/food/birthdaycake.gif'},
-
-//Happy 
-
- {name:':cloud9',url:
-'qrc:///images/smileys/happy/cloud9.gif'},
-
- {name:':tearsofjoy',url:
-'qrc:///images/smileys/happy/tearsofjoy.gif' },
-
-//Repsect 
-
- {name:':bow',url:
-'qrc:///images/smileys/respect/bow.gif'},
-
- {name:':bravo',url:
-'qrc:///images/smileys/respect/bravo.gif'},
-
- {name:':hailking',url:
-'qrc:///images/smileys/respect/hailking.gif'},
-
- {name:':number1',url:
-'qrc:///images/smileys/respect/number1.gif' },
-
-//Laugh 
-
- {name:':hahaha',url:
-'qrc:///images/smileys/laugh/hahaha.gif'},
-
- {name:':loltv',url:
-'qrc:///images/smileys/laugh/loltv.gif' },
-
- {name:':rofl',url:
-'qrc:///images/smileys/laugh/rofl.gif'},
-
-//Music 
-
- {name:':drums',url:
-'qrc:///images/smileys/music/drums.gif'},
-
-
- {name:':guitar',url:
-'qrc:///images/smileys/music/guitar.gif'},
-
- {name:':trumpet',url:
-'qrc:///images/smileys/music/trumpet.gif' },
-
-//smileys that used to be in core
-
- {name:':headbang',url:
-'qrc:///images/smileys/oldcore/headbang.gif'},
-
- {name:':beard',url:
-'qrc:///images/smileys/oldcore/beard.png'},
-
- {name:':whitebeard',url:
-'qrc:///images/smileys/oldcore/whitebeard.png'},
-
- {name:':shaka',url:
-'qrc:///images/smileys/oldcore/shaka.gif'},
-
- {name:':\\.../',url:
-'qrc:///images/smileys/oldcore/shaka.gif'},
-
- {name:':\\ooo/',url:
-'qrc:///images/smileys/oldcore/shaka.gif' },
-
- {name:':headdesk',url:
-'qrc:///images/smileys/oldcore/headbang.gif' },
-
-//These two are still in core, so oldcore isn't strictly right, but we don't want too many directories
-
- {name:':-d',url:
-'qrc:///images/smileys/oldcore/laughing.gif'},
-
- {name:':-o',url:
-'qrc:///images/smileys/oldcore/surprised.gif' },
-
-// Regex killers - stick these at the bottom so they appear at the end of the English and 
-// at the start of $OtherLanguage.
-
- {name:':cool',url:
-'qrc:///images/smileys/cool/cool.gif' },	
-
- {name:':vomit',url:
-'qrc:///images/smileys/disgust/vomit.gif' },
-
- {name:':golf',url:
-'qrc:///images/smileys/sport/golf.gif' },
-	
- {name:':football',url:
-'qrc:///images/smileys/sport/football.gif'},
-
- {name:':tennis',url:
-'qrc:///images/smileys/sport/tennis.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:'(.)(.) ',url:
-'qrc:///images/smileys/adult/tits.gif'},
-
-{name:':bong',url:
-'qrc:///images/smileys/adult/bong.gif'},
-
-{name:':sperm',url:
-'qrc:///images/smileys/adult/sperm.gif'},
-
-{name:':drunk',url:
-'qrc:///images/smileys/adult/drunk.gif'},
-
-{name:':finger',url:
-'qrc:///images/smileys/adult/finger.gif'}
-]
diff --git a/source-android/js/yplayer.html b/source-android/js/yplayer.html
deleted file mode 100644
index 8222d36..0000000
--- a/source-android/js/yplayer.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-  <head>
-    <title>-1</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
-  </head>
-  <body bgcolor="black" marginwidth="0" marginheight="0">
-    <div id="player"></div>
-    <script>
-        function getVideoId() {
-          return window.location.href.slice(window.location.href.indexOf('?') + 1);
-        }
-        var tag = document.createElement('script');
-        tag.src = "https://www.youtube.com/iframe_api";
-        var firstScriptTag = document.getElementsByTagName('script')[0];
-        firstScriptTag.parentNode.insertBefore(tag, firstScriptTag);
-        
-        var player;
-        function onYouTubeIframeAPIReady() {
-          player = new YT.Player('player', {
-            playerVars: { 'html5': 1, 'iv_load_policy': 3 },
-            frameborder: '0',
-            height: '100%',
-            width: '100%',
-            videoId: getVideoId(),
-            events: {
-              'onReady': onPlayerReady,
-              'onStateChange': onPlayerStateChange
-            }
-          });
-        }
-        
-        function onPlayerReady(event) {
-          document.title = 0;
-        }
-
-        function onPlayerStateChange(event) {
-          if (event.data == YT.PlayerState.PLAYING) {
-            document.title = 1;
-          } else if (event.data == YT.PlayerState.ENDED || event.data == YT.PlayerState.PAUSED) {
-            document.title = 2;
-          }
-        }
-    </script>
-  </body>
-</html>
\ No newline at end of file
diff --git a/source-android/qml/calendarqml b/source-android/qml/calendarqml
new file mode 120000
index 0000000..b621df7
--- /dev/null
+++ b/source-android/qml/calendarqml
@@ -0,0 +1 @@
+./../../source-linux/qml/calendarqml/
\ No newline at end of file
diff --git a/source-android/qml/calendarqml/CalendarDay.qml b/source-android/qml/calendarqml/CalendarDay.qml
deleted file mode 100644
index cfc1488..0000000
--- a/source-android/qml/calendarqml/CalendarDay.qml
+++ /dev/null
@@ -1,78 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.11
-//import QtQuick.Controls 2.4
-
-Item {
-    id: calendarDay
-    width:7*mm
-    height: 7*mm
-    property int dateInt:Math.floor((Date.parse(model.date)-(new Date().getTimezoneOffset() * 60 * 1000))/86400000)
-    Rectangle {
-        id: placeHolder
-        color: 'lightblue'; antialiasing: true
-        anchors.fill:parent
-    }
-    Text {
-        id:daytext
-        anchors.right: parent.right
-        anchors.margins: 0.5*mm
-        color:(model.month==monthgrid.month)?"black":"grey"
-        wrapMode: Text.WrapAnywhere
-        text: model.day
-        font.bold: model.today
-        font.pixelSize: 4*mm
-    }
-    Rectangle {
-        id:eventRect
-        color:"black"
-        anchors.margins: 0.5*mm
-        anchors.bottom: calendarDay.bottom
-        width: parent.width-mm
-        height: mm
-        visible: eventdays.indexOf(dateInt)>-1
-    }
-    MouseArea {
-        anchors.fill: calendarDay
-        onClicked: {
-            var eventDate=[];
-            var idx = eventdays.indexOf(dateInt);
-            while (idx != -1) {
-                eventDate.push(idx);
-                idx = eventdays.indexOf(dateInt,idx + 1)
-            }
-            var component = Qt.createComponent("qrc:/qml/calendarqml/EventList.qml");
-            if (component.status== Component.Ready){
-                var eventlist = component.createObject(calendartab,{"daylist": eventDate})}
-        }
-    }
-}
diff --git a/source-android/qml/calendarqml/CalendarTab.qml b/source-android/qml/calendarqml/CalendarTab.qml
deleted file mode 100644
index 10b4e78..0000000
--- a/source-android/qml/calendarqml/CalendarTab.qml
+++ /dev/null
@@ -1,174 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.0
-import QtQuick.Controls 2.4
-import QtQml 2.2
-import Qt.labs.calendar 1.0
-//import QtQuick.Controls 1.2 as Oldcontrol
-import QtQuick.Layouts 1.3
-import "qrc:/js/service.js" as Service
-import "qrc:/js/helper.js" as Helperjs
-import "qrc:/qml/calendarqml"
-import "qrc:/qml/genericqml"
-
-Rectangle {
-    id:calendarrectangle
-//    y:1
-//    width:root.width-mm
-//    height:root.height-5*mm
-    anchors.fill: parent
-    color: '#fff'
-    property date currentTime: new Date()
-    property int offsetTime: currentTime.getTimezoneOffset() * 60 * 1000
-    property var events:[]
-    property var eventdays:[]
-    //onEventdaysChanged: print(JSON.stringify(eventdays))
-
-    function showEvents(friend){
-        if(friend=="backButton"){Service.eventsfromdb(db,login.username,function(eventArray,dayArray){
-            events=eventArray;
-            eventdays=dayArray})
-        }
-        else if (friend!=""){
-           calendartab.calendartabstatus=friend.url.substring(friend.url.lastIndexOf("/")+1,friend.url.length)
-            Service.newRequestFriendsEvents(login,friend,calendartab,function(eventArray,dayArray){
-            events=eventArray;
-            eventdays=dayArray})
-        }
-        else {calendartab.calendartabstatus="Events";
-            Service.eventsfromdb(db,login.username,function(eventArray,dayArray){
-                events=eventArray;
-                eventdays=dayArray;
-                calBusy.running=false
-            })
-        }
-    }
-
-    BusyIndicator{
-         id: calBusy
-         anchors.horizontalCenter: calendarView.horizontalCenter
-         anchors.top:calendarView.top
-         anchors.topMargin: 2*mm
-         width:10*mm
-         height: 10*mm
-         running: false
-       }
-
-
-    MButton{
-        id:  updateEvents
-        anchors.top: parent.top
-        anchors.topMargin: 0.5*mm
-        anchors.right:calendartabstatusButton.left
-        anchors.rightMargin:mm
-        height: 6*mm
-        width: 8*mm
-        text:"\uf021"
-        onClicked: {
-            Service.getEvents(db,login, calendartab,function(){
-               showEvents("")
-    })}}
-
-    MButton{
-        id:  calendartabstatusButton
-        anchors.top: parent.top
-        anchors.topMargin: 0.5*mm
-        anchors.right: parent.right
-        anchors.rightMargin:2*mm
-        height: 6*mm
-        width: Math.max(10*mm,implicitWidth)
-        text: calendartab.calendartabstatus=="Events"?qsTr("Events"):calendartabstatus
-        Menu {
-            id:calendartabmenu
-            width: 40*mm
-            MenuItem {
-                text: qsTr("Own Calendar")
-                font.pixelSize: 3*mm
-                onTriggered: {
-                    calendartab.calendartabstatus="Events";
-                   // calendartabstatusButton.text=qsTr("own Calendar");
-                    showEvents("")}
-            }
-        }
-        onClicked: {calendartabmenu.popup()}
-    }
-
-
-    ListView{
-        id: calendarView
-        x: mm;y:8*mm
-        width: parent.width-2*mm; height: parent.height-9*mm
-        clip: true
-        snapMode: ListView.SnapOneItem
-        orientation: ListView.Horizontal
-        highlightRangeMode: ListView.StrictlyEnforceRange
-        model:     CalendarModel {id:calendarModel
-            from: new Date()
-            to: new Date(new Date().valueOf()+93312000000)
-        }
-        delegate:
-            ColumnLayout{
-                width:calendarView.width
-                Text{
-                    font.bold: true
-                    Layout.fillWidth: true
-                    horizontalAlignment:Text.AlignHCenter
-                    text: model.year
-                }
-                Text{
-                    text: Qt.locale().standaloneMonthName(model.month)
-                    Layout.fillWidth: true
-                   horizontalAlignment:Text.AlignHCenter
-                }
-                DayOfWeekRow{
-                    locale: monthgrid.locale
-                    Layout.fillWidth: true
-                    font.pixelSize: 3*mm
-                }
-
-                MonthGrid {
-                    id: monthgrid
-                    Layout.fillWidth: true
-                    month: model.month
-                    year: model.year
-                    locale: Qt.locale()
-                    delegate: CalendarDay{}
-               }
-        }
-        ScrollIndicator.horizontal: ScrollIndicator { }
-    }
-    
-    Component.onCompleted: {
-        root.eventSignal.connect(showEvents);
-        if (calendartab.calendartabstatus=="Events"){showEvents("")}
-    }
- }
diff --git a/source-android/qml/calendarqml/EventList.qml b/source-android/qml/calendarqml/EventList.qml
deleted file mode 100644
index 5028ae7..0000000
--- a/source-android/qml/calendarqml/EventList.qml
+++ /dev/null
@@ -1,117 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.0
-import QtQuick.Controls 2.4
-import "qrc:/js/service.js" as Service
-import "qrc:/js/helper.js" as Helperjs
-import "qrc:/qml/genericqml"
-
-Rectangle{
-    id:eventList
-    z:2
-    border.color: "grey"
-    width: parent.width-4*mm
-    height:parent.height-12*mm
-    x:mm
-    y:mm
-    property var daylist:[]
-
-    MButton{
-       id:closeButton
-       anchors.top: parent.top
-       anchors.topMargin: 1*mm
-       anchors.right: parent.right
-       anchors.rightMargin: 1*mm
-       height: 6*mm
-       width: 8*mm
-       text: "\uf057"
-       onClicked:{eventList.destroy()}
-    }
-      ListView {
-          id: eventlistView
-          x: mm
-          y:closeButton.height+2*mm
-          width: eventList.width-2*mm
-          height: eventList.height-closeButton.height-4*mm
-          clip: true
-          model: eventModel
-          delegate: eventItem
-     }
-
-     ListModel{
-         id: eventModel
-     }
-
-     Component.onCompleted:{
-         for (var i=0; i<daylist.length;i++){
-             var liststate="";if(daylist.length<2){liststate="large"}
-             eventModel.append({"event":events[daylist[i]],"eventstatus":liststate});
-         }
-     }
-
-     Component{
-         id:eventItem
-         Rectangle{
-            property string status: eventstatus
-             width:eventlistView.width
-             height:eventNameText.height+eventDetailsText.height+mm
-             border.color: "light grey"
-             border.width: 1
-            Text {
-                id:eventNameText
-                x:mm
-                width:parent.width
-                height:contentHeight
-                text: new Date(event.start+calendarrectangle.offsetTime).toLocaleTimeString()+": "+event.title
-                font.pixelSize: 3*mm
-                wrapMode:Text.Wrap
-            }
-            
-            Text {
-                id:eventDetailsText
-                x:mm
-                z:4
-                width: parent.width
-                height: contentHeight
-                text: status==""?"":Qt.atob(event.html)
-                anchors.top: eventNameText.bottom
-                font.pixelSize: 3*mm
-                wrapMode:Text.Wrap
-            }
-            MouseArea{
-                anchors.fill: parent
-                onClicked:{if (status==""){status="large"} else {status=""}
-                }
-            }
-         }
-    }
-}
diff --git a/source-android/qml/configqml b/source-android/qml/configqml
new file mode 120000
index 0000000..a5fb93b
--- /dev/null
+++ b/source-android/qml/configqml
@@ -0,0 +1 @@
+./../../source-linux/qml/configqml/
\ No newline at end of file
diff --git a/source-android/qml/configqml/AccountPage.qml b/source-android/qml/configqml/AccountPage.qml
deleted file mode 100644
index f593ed1..0000000
--- a/source-android/qml/configqml/AccountPage.qml
+++ /dev/null
@@ -1,463 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.7
-import QtQuick.Dialogs 1.2
-import QtQuick.Controls 2.4
-
-import "qrc:/js/service.js" as Service
-import "qrc:/js/layout.js" as Layoutjs
-import "qrc:/js/helper.js" as Helperjs
-import "qrc:/qml/configqml"
-import "qrc:/qml/genericqml"
-
-Page{
-        id:accountPage
-        width: root.width
-        height: root.height
-        property var users:[]
-        property var userdata: ({})
-
-        function setServericon(server){
-           try {Helperjs.friendicaWebRequest(server+"/api/statusnet/config",accountPage, function (obj){
-               var serverdata = JSON.parse(obj);
-               servericon.visible=true;
-               servericon.source=serverdata.site.logo})} catch(e){print(e)}
-        }
-
-        Button{
-            id:userButton
-            height: 8*mm
-            text:qsTr("User")
-            font.pixelSize: 3*mm
-            x: mm
-            y: mm
-            width: root.width/2
-            onClicked:{
-                var useritems="";
-                for (var i=0;i<accountPage.users.length;i++){
-
-                    useritems=useritems+"MenuItem{font.pixelSize: 3*mm; text:'"+accountPage.users[i].username+
-                        "'; onTriggered: {Service.readConfig(db,function(obj){
-                        userButton.text=obj.username;
-                        servername.text=obj.server;
-                        accountPage.setServericon(obj.server);
-                        username.text= obj.username;
-                        password.text=Qt.atob(obj.password);
-                        imagestore.text=obj.imagestore;
-                        newsTypeField.text=obj.newsViewType;
-                        if( obj.isActive==0){userButton.font.bold='true'} else {userButton.font.bold='false'}
-                        },'username','"+ accountPage.users[i].username+"')}}"
-                    }
-                var menuString="import QtQuick.Controls 2.4;import 'qrc:/js/service.js' as Service; Menu {"+useritems+"}";
-                var userlistObject=Qt.createQmlObject(menuString,accountPage,"usermenuOutput")
-                userlistObject.popup()  }
-            }
-
-    Text {
-        text: qsTr("Server")
-        font.pixelSize:3*mm
-        x: 4*mm; y: 10*mm
-    }
-    Text {
-        text: qsTr("Nickname")
-        font.pixelSize:3*mm
-        x: 4*mm; y: 20*mm
-    }
-
-    Text {
-        text: qsTr("Password")
-        font.pixelSize:3*mm
-        x: 4*mm; y: 30*mm
-      }
-    Text {
-        text: qsTr("Image dir.")
-        font.pixelSize:3*mm
-        x: 4*mm; y: 40*mm
-     }
-
-//    Text {
-//        text: qsTr("Max. News")
-//        font.pixelSize:3*mm
-//        x: 4*mm; y: 50*mm
-//     }
-    Text {
-        text: qsTr("News as")
-        font.pixelSize:3*mm
-        x: 4*mm; y: 50*mm
-    }
-
-      
-//    Text {
-//          text: qsTr("Show Website")
-//          x: 4*mm; y:80*mm; width: 20*mm
-//    }
-
-    Image{
-        id:servericon
-        x:4*mm;y:13.5*mm
-        width:5*mm; height: 5*mm
-        visible: false
-        source:""
-        MouseArea{
-            anchors.fill:parent
-            onClicked:{
-                Service.showServerConfig(servername.text, accountPage, function(configString){
-                var serverconfigObject=Qt.createQmlObject(configString,accountPage,"serverconfigOutput");})
-            }
-        }
-    }
-
-    Button{
-        id:serverSearchButton
-        text:"\uf002"
-        font.pixelSize: 3*mm
-        x:4*mm
-        y:13.5*mm
-        width: 5*mm; height:5*mm
-        visible: servericon.visible?false:true
-        onClicked:{Qt.openUrlExternally(Qt.resolvedUrl("https://dir.friendica.social/servers"))}
-    }
-
-    Rectangle{color: "light grey";  x: 10*mm; y: 13.5*mm; width: root.width-12*mm; height: 5*mm;}
-    Flickable {
-        id: servernameFlickable
-        x: 10*mm; y: 13.5*mm; width: root.width-12*mm; height: 5*mm;
-        contentWidth: servername.paintedWidth
-        contentHeight: servername.paintedHeight
-        clip: true
-        TextEdit {
-            id: servername
-            width: servernameFlickable.width
-            height: servernameFlickable.height
-            focus: true
-            font.pixelSize:3*mm
-            text:"https://"
-            onEditingFinished:{
-                 if((servername.text).substring(0,11) =="https://http"){
-                     serverstring.text= (serverstring.text).substring(8)
-                 }
-               accountPage.setServericon(servername.text)
-             }
-            onCursorRectangleChanged: Layoutjs.ensureVisibility(cursorRectangle,servernameFlickable)
-        }
-    }
-
-    Rectangle{
-        color: "light grey"
-        x: 4*mm; y: 23.5*mm; width: root.width-14*mm; height: 5*mm;
-        TextInput {
-            id: username
-            anchors.fill: parent
-            font.pixelSize:3*mm
-            selectByMouse: true
-            onEditingFinished:{
-                if (username.text.indexOf('@')>-1){
-                    Helperjs.showMessage(qsTr("Error"),qsTr("Nicknames containing @ symbol currently not supported"),accountPage)
-                }
-            }
-         }
-    }
-    Button {
-        x: root.width-9*mm; y: 23.5*mm; width:5*mm; height:5*mm
-        text: "\uf234"
-        font.pixelSize: 3*mm
-        onClicked: {
-            configStack.push({item:"qrc:/qml/configqml/RegisterPage.qml",properties:{url:servername.text+"/register?nickname="+username.getText(0,username.length)}})
-        }
-    }
-
-    Rectangle{
-        color: "light grey"
-         x: 4*mm; y: 33.5*mm; width: root.width-6*mm; height: 5*mm;
-         TextInput {
-             id: password
-             anchors.fill: parent
-             font.pixelSize:3*mm
-             selectByMouse: true
-             echoMode: TextInput.PasswordEchoOnEdit
-        }
-    }
-
-    Rectangle{color: "light grey"; x: 4*mm; y: 43.5*mm; width: root.width-14*mm; height: 5*mm;}
-    Flickable {
-         id: imagestoreFlickable
-         x: 4*mm; y: 43.5*mm; width: root.width-14*mm; height: 5*mm;
-         clip: true
-         TextInput {
-             id: imagestore
-             width: imagestoreFlickable.width
-             height: imagestoreFlickable.height
-             font.pixelSize:3*mm
-             wrapMode: TextEdit.NoWrap
-             onCursorRectangleChanged: Layoutjs.ensureVisibility(cursorRectangle,imagestoreFlickable)
-         }
-     }
-
-    FileDialog {
-        id: imagestoreDialog
-        title: "Please choose a directory"
-        folder: shortcuts.pictures
-        selectFolder: true
-        onAccepted: {
-            var imagestoreString=imagestoreDialog.folder.toString();
-            imagestoreString=imagestoreString.replace(/^(file:\/{2})/,"")+"/"
-            imagestore.text=imagestoreString
-        }
-    }
-
-     Button {
-            x: root.width-9*mm; y: 43.5*mm; width: 5*mm; height: 5*mm;
-            text: "..."
-            font.pixelSize: 3*mm
-            onClicked:
-         {imagestoreDialog.open()}
-     }
-
-
-//    Slider{ id: maxNews
-//        x:19*mm; y: 53.5*mm;width: root.width/2;height:5*mm
-//        from: 0;to:2000; stepSize: 100
-//    }
-
-
-//    Rectangle{color: "light grey"; x: 4*mm; y: 53.5*mm; width: 9*mm; height: 5*mm;
-//        TextEdit{id:maxNewsText;
-//            anchors.fill: parent
-//            font.pixelSize:3*mm
-//            verticalAlignment:TextEdit.AlignRight
-//            text:maxNews.value
-//            focus: true
-//            selectByMouse: true
-//        }
-//    }
-
-    Rectangle{
-         x: 4*mm; y: 53.5*mm; width: newsTypeField.contentWidth+2*mm; height: 5*mm;
-         color:"light grey"
-         Text{
-             id: newsTypeField
-             anchors.fill: parent
-             font.pixelSize:3*mm
-             text:"Conversations"
-        }
-        MouseArea{
-            anchors.fill:parent
-            onClicked:newstypemenu.popup()
-        }
-    }
-
-    BusyIndicator{
-        id: accountBusy
-         anchors.horizontalCenter: parent.horizontalCenter
-         y: 63.5*mm
-         width:10*mm
-         height: 10*mm
-         running: false
-    }
-//    CheckBox{
-//        id:showwebsiteCheckbox
-//        x:35*mm;y:80*mm
-//        onClicked:{
-//            if (checked==true){
-//                Service.updateglobaloptions(root.db,"showWebsiteForLinks","true")
-//                root.globaloptions.showWebsiteForLinks="true"
-//            }
-//            else {
-//                Service.updateglobaloptions(root.db,"showWebsiteForLinks","false")
-//                root.globaloptions.showWebsiteForLinks="false"
-//            }
-//        }
-//    }
-
-    Button {
-    x: 4*mm; y: 63.5*mm
-    height: 8*mm
-    text: qsTr("Confirm")
-    font.pixelSize: 3*mm
-    onClicked:{
-        accountBusy.running=true;
-         var userconfig={server: servername.text, username: username.text, password:Qt.btoa(password.text), imagestore:imagestore.text, maxnews:"",interval:  "",newsViewType:newsTypeField.text};
-         var errormessage="";
-         if (servername.text==""){errormessage=qsTr("No server given! ")}
-         else if (username.text==""){errormessage+=qsTr("No nickname given! ")}
-         else if (password.text=="") {errormessage+=qsTr("No password given! ")}
-         else if (imagestore.text=="") {errormessage+=qsTr("No image directory given!")}
-         //else if (maxNewsText.text=="") {errormessage+=qsTr("No maximum news number given!")}
-         else {errormessage=""}
-         if (errormessage=="") {
-             Helperjs.friendicaRequest(userconfig,"/api/account/verify_credentials?skip_status=true",root,function(obj){
-                accountBusy.running=false;
-                 var credentials=JSON.parse(obj);
-                 if (credentials.hasOwnProperty('status')){
-                     Helperjs.showMessage(qsTr("Error"),qsTr("Wrong password!"),root)
-                 }
-                 else{
-                     filesystem.Directory=userconfig.imagestore;
-                     filesystem.makeDir("contacts");
-                     filesystem.makeDir("albums");
-                     Service.storeConfig(db,userconfig);
-                     Service.readConfig(db,function(userconfig){
-                         Helperjs.readData(db,"config","",function(storedUsers){
-                            storedUsers.sort(function(obj1, obj2) {
-                                return obj1.isActive - obj2.isActive;
-                            });
-                         accountPage.users=storedUsers});
-                         //reset values
-                         root.login=userconfig;
-                         root.news=[];
-                     },"isActive",0);
-
-                     //Service.requestProfile(userconfig,db,root,function(nc){root.newContacts=nc});
-                     Helperjs.showMessage(qsTr("Success"),qsTr("Name")+": "+credentials.name+"\nScreen Name: "+credentials.screen_name,root)
-                 }
-             });
-
-        }
-         else {Helperjs.showMessage(qsTr("Error"), errormessage,root)}
-    }}
-
-
-
-    Button {
-    x: parent.width/2+2*mm; y: mm; width: 5*mm; height: 8*mm;
-    text: "-"
-    font.pixelSize: 3*mm
-    onClicked:{
-        var userconfig={server: servername.text, username: username.text, password: Qt.btoa(password.text)};
-        Service.deleteConfig(db,userconfig,function(){
-           filesystem.Directory=imagestore.text+"contacts";
-           filesystem.rmDir();
-           filesystem.Directory=imagestore.text+"albums";
-           filesystem.rmDir();
-           servername.text="https://";
-           servericon.visible=false;
-           servericon.source="";
-           username.text="";
-           password.text="";
-           imagestore.text="";
-           //maxNews.value=0;
-           newsTypeField.text="Conversations";
-           //messageIntervalSlider.value=30;
-           userButton.text=qsTr("User");
-           Helperjs.readData(db,"config","",function(storedUsers){
-             storedUsers.sort(function(obj1, obj2) {
-                 return obj1.isActive - obj2.isActive;
-             })
-             accountPage.users=storedUsers;})
-       })
-    }}
-
-    Button {
-    x: parent.width/2+8*mm; y: mm; width: 5*mm; height: 8*mm;
-    text: "+"
-    font.pixelSize: 3*mm
-    onClicked:{
-        servername.text="https://"
-        servericon.visible=false;
-        servericon.source="";
-        username.text=""
-        password.text=""
-        imagestore.text=""
-        //maxNews.value=0
-        newsTypeField.text="Conversations"
-        //messageIntervalSlider.value=30
-        userButton.text=qsTr("User")
-       }
-     }
-
-    Button {
-        x: parent.width/2+14*mm; y: mm; width: 5*mm; height: 8*mm;
-        text: "?"
-        font.pixelSize: 3*mm
-        onClicked:{
-                    root.push("qrc:/qml/configqml/InfoBox.qml");
-           }
-         }
-    Button{
-        id:closeButton
-        height: 8*mm
-        anchors.top: parent.top
-        anchors.topMargin: 1*mm
-        anchors.right: parent.right
-        anchors.rightMargin: 1*mm
-        text:   "\uf057"
-        font.pixelSize: 3*mm
-        onClicked:{root.pop()}
-    }
-    Menu {
-        id:newstypemenu
-        MenuItem {
-            font.pixelSize: 3*mm
-            text: qsTr("Timeline")
-            onTriggered: {newsTypeField.text="Timeline"}
-            }
-        MenuItem {
-            font.pixelSize: 3*mm
-            text: qsTr("Conversations")
-            onTriggered: {newsTypeField.text="Conversations"}
-            }
-    }
-
-   Component.onCompleted: {
-      try{Helperjs.readData(db,"config","",function(storedUsers){
-          storedUsers.sort(function(obj1, obj2) {
-              return obj1.isActive - obj2.isActive;
-          })
-          accountPage.users=storedUsers;
-          Service.readConfig(db,function(obj){
-            userButton.text=obj.username;
-            servername.text=obj.server;
-            accountPage.setServericon(obj.server);
-            username.text= obj.username;
-            password.text=Qt.atob(obj.password);
-            imagestore.text=obj.imagestore;
-            //maxNews.value=obj.maxnews;
-            newsTypeField.text=obj.newsViewType;
-            //messageIntervalSlider.value=obj.timerInterval;
-            if( obj.isActive==0){userButton.font.bold='true'} else {userButton.font.bold='false'}
-          },"isActive",0)
-      })
-//            Service.readGlobaloptions(db,function(go){
-//                if (root.globaloptions.showWebsiteForLinks!="false"){showwebsiteCheckbox.checked=true}
-//            })
-  
-          }
-      catch (e){print(e)
-//          Helperjs.friendicaWebRequest("https://dir.friendica.social/servers/surprise",accountPage,function(html){
-//              print(html);
-//              var bpos=html.indexOf("base ");
-//              var baseurl=html.substring(html.indexOf("http",bpos),html.indexOf('"',html.indexOf("http",bpos)));
-//              servername.text=baseurl
-//          })
-      }
-    }
-}
diff --git a/source-android/qml/configqml/ConfigPage.qml b/source-android/qml/configqml/ConfigPage.qml
deleted file mode 100644
index 7593d81..0000000
--- a/source-android/qml/configqml/ConfigPage.qml
+++ /dev/null
@@ -1,227 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.11
-import QtQuick.Dialogs 1.2
-import QtQuick.Controls 2.4
-
-import "qrc:/js/service.js" as Service
-//import "qrc:/js/layout.js" as Layoutjs
-//import "qrc:/js/helper.js" as Helperjs
-import "qrc:/qml/configqml"
-import "qrc:/qml/genericqml"
-
-Page{
-       //anchors.fill: parent
-    width:root.width
-    height:root.height
-    //contentHeight: configBackground.height
-    //boundsBehavior: Flickable.StopAtBounds
-   
-//    Rectangle{
-//        id:configBackground
-//        color: "white"
-//        anchors.fill: parent
-//        width:parent.width
-//        height:Math.max(90*mm,root.height-12*mm)
-//        property var users:[]
-//        property bool registeredUser: true
-//        property var userdata: ({})
-
-//    Text {
-//        text: qsTr("Image dir.")
-//        //text: qsTr("Max. News")
-//        font.pixelSize:3*mm
-//        x: 4*mm; y: 10*mm
-//     }
-    Text {
-        text: qsTr("Max. News")
-        //text: qsTr("News as")
-        font.pixelSize:3*mm
-        x: 4*mm; y:10*mm
-    }
-
-      
-//    Text {
-//          text: qsTr("Show Website")
-//          x: 4*mm; y: 40*mm; width: 20*mm
-//    }
-
-
-//    Rectangle{color: "light grey"; x: 4*mm; y: 13.5*mm; width: root.width-14*mm; height: 5*mm;}
-//    Flickable {
-//         id: imagestoreFlickable
-//         x: 4*mm; y: 13.5*mm; width: root.width-14*mm; height: 5*mm;
-//         clip: true
-//         TextInput {
-//             id: imagestore
-//             width: imagestoreFlickable.width
-//             height: imagestoreFlickable.height
-//             font.pixelSize:3*mm
-//             wrapMode: TextEdit.NoWrap
-//             onCursorRectangleChanged: Layoutjs.ensureVisibility(cursorRectangle,imagestoreFlickable)
-//         }
-//     }
-
-//    FileDialog {
-//        id: imagestoreDialog
-//        title: "Please choose a directory"
-//        folder: shortcuts.pictures
-//        selectFolder: true
-//        onAccepted: {
-//            var imagestoreString=imagestoreDialog.folder.toString();
-//            imagestoreString=imagestoreString.replace(/^(file:\/{2})/,"")+"/"
-//            imagestore.text=imagestoreString
-//        }
-//    }
-
-//     Button {
-//            x: root.width-9*mm; y: 13.5*mm; width: 7*mm; height: 8*mm;
-//            text: "..."
-//            onClicked:
-//         {imagestoreDialog.open()}
-//     }
-
-
-    Slider{ id: maxNews
-        x:19*mm; y: 13.5*mm;width: root.width/2;height:5*mm
-        from: 0;to:2000; stepSize: 100
-        value:  root.globaloptions.hasOwnProperty("max_news")?root.globaloptions.max_news:1000
-    }
-
-
-    Rectangle{color: "light grey"; x: 4*mm; y: 13.5*mm; width: 9*mm; height: 5*mm;
-        radius: 0.5*mm
-        TextEdit{id:maxNewsText;
-            anchors.fill: parent
-            font.pixelSize:3*mm
-            verticalAlignment:TextEdit.AlignRight
-            text:maxNews.value
-            focus: true
-            selectByMouse: true
-            onTextChanged: {
-                Service.updateglobaloptions(root.db,"max_news",text);
-            }
-        }
-    }
-
-    Rectangle{
-         x: 4*mm; y:23.5*mm; width: parent.width - 14*mm; height: 5*mm;
-         color:"light grey"
-         radius: 0.5*mm
-         Text{
-             anchors.fill: parent
-             font.pixelSize:3*mm
-             text:qsTr("Sync")
-        }
-        MouseArea{
-            anchors.fill:parent
-            onClicked:root.push("qrc:qml/configqml/SyncConfig.qml");
-        }
-    }
-//    Slider{ id: messageIntervalSlider
-//        x:22*mm; y: 73.5*mm;width: root.width/2;height:5*mm
-//        from: 0;to:120; stepSize: 15
-//    }
-//    Rectangle{
-//         x: 4*mm; y: 73.5*mm; width: 9*mm; height: 5*mm;
-//         TextEdit{
-//             id: messageIntervalField
-//             anchors.fill: parent
-//             font.pixelSize:3*mm
-//             verticalAlignment:TextEdit.AlignRight
-//             text:messageIntervalSlider.value
-//             focus: true
-//             selectByMouse: true
-//        }
-//    }
-//    Text{x: 14*mm; y: 73.5*mm; width: 5*mm; height: 5*mm;
-//        font.pixelSize:3*mm
-//        text:qsTr("Min.")
-//    }
-
-//    CheckBox{
-//        id:showwebsiteCheckbox
-//        x:35*mm;y:80*mm
-//        onClicked:{
-//            if (checked==true){
-//                Service.updateglobaloptions(root.db,"showWebsiteForLinks","true")
-//                root.globaloptions.showWebsiteForLinks="true"
-//            }
-//            else {
-//                Service.updateglobaloptions(root.db,"showWebsiteForLinks","false")
-//                root.globaloptions.showWebsiteForLinks="false"
-//            }
-//        }
-//    }
-
-    MButton {
-        anchors.right: closeButton.left; anchors.rightMargin: mm;
-        anchors.top: parent.top
-        anchors.topMargin: 1*mm
-        width: 8*mm; height: 6*mm;
-        text: "?"
-        font.pixelSize: 3*mm
-        onClicked:{
-                    root.push("qrc:/qml/configqml/InfoBox.qml");
-           }
-         }
-    MButton{
-         id:closeButton
-         height: 6*mm
-         width :8*mm
-         anchors.top: parent.top
-         anchors.topMargin: 1*mm
-         anchors.right: parent.right
-         anchors.rightMargin: 1*mm
-         text:   "\uf057"
-         font.pixelSize: 3*mm
-         onClicked:{root.pop()}
-    }
-//    Menu {
-//        id:newstypemenu
-//        MenuItem {
-//            text: qsTr("Timeline")
-//            onTriggered: {newsTypeField.text="Timeline"}
-//            }
-//        MenuItem {
-//            text: qsTr("Conversations")
-//            onTriggered: {newsTypeField.text="Conversations"}
-//            }
-//    }
-
-//    Component.onCompleted: {
-//        Service.readGlobaloptions(db,function(go){
-//            if(go.hasOwnProperty("max_news")){maxNews.value=go.max_news}else{maxNews.value=1000}
-//            //if (root.globaloptions.showWebsiteForLinks!="false"){showwebsiteCheckbox.checked=true}
-//        })
-//    }
-}
diff --git a/source-android/qml/configqml/ConfigTab.qml b/source-android/qml/configqml/ConfigTab.qml
deleted file mode 100644
index e13aefd..0000000
--- a/source-android/qml/configqml/ConfigTab.qml
+++ /dev/null
@@ -1,482 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.7
-import QtQuick.Dialogs 1.2
-import QtQuick.Controls 1.2
-
-import "qrc:/js/service.js" as Service
-import "qrc:/js/layout.js" as Layoutjs
-import "qrc:/js/helper.js" as Helperjs
-import "qrc:/qml/configqml"
-import "qrc:/qml/genericqml"
-
-StackView{
-   id: configStack
-   anchors.fill:parent
-   initialItem: Flickable{
-    width:root.width-5*mm
-    height:root.height-12*mm
-    contentHeight: configBackground.height
-    boundsBehavior: Flickable.StopAtBounds
-   
-    Rectangle{
-        id:configBackground
-        color: "white"
-        width:parent.width
-        height:Math.max(90*mm,root.height-12*mm)
-        property var users:[]
-        property bool registeredUser: true
-        property var userdata: ({})
-
-        function setServericon(server){
-           try {Helperjs.friendicaWebRequest(server+"/api/statusnet/config",configBackground, function (obj){
-               var serverdata = JSON.parse(obj);
-               servericon.visible=true;
-               servericon.source=serverdata.site.logo})} catch(e){print(e)}
-        }
-
-        BlueButton{
-            id:userButton
-            text:qsTr("User")
-            y:mm
-            width: root.width/2
-            onClicked:{
-                var useritems="";
-                for (var i=0;i<configBackground.users.length;i++){
-
-                    useritems=useritems+"MenuItem{text:'"+configBackground.users[i].username+
-                        "'; onTriggered: {Service.readConfig(db,function(obj){
-                        configBackground.registeredUser=true;
-                        userButton.text=obj.username;
-                        servername.text=obj.server;
-                        configBackground.setServericon(obj.server);
-                        username.text= obj.username;
-                        password.text=Qt.atob(obj.password);
-                        imagestore.text=obj.imagestore;
-                        maxNews.value=obj.maxnews;
-                        newsTypeField.text=obj.newsViewType;
-                        if( obj.isActive==0){userButton.fontColor='black'} else {userButton.fontColor='grey'}
-                        },'username','"+configBackground.users[i].username+"')}}"
-                    }
-                var menuString="import QtQuick.Controls 1.4;import 'qrc:/js/service.js' as Service; Menu {"+useritems+"}";
-                var userlistObject=Qt.createQmlObject(menuString,configBackground,"usermenuOutput")
-                userlistObject.popup()  }
-            }
-
-    Text {
-        text: qsTr("Server")
-        font.pixelSize:3*mm
-        x: 4*mm; y: 10*mm
-    }
-    Text {
-        text: qsTr("Nickname")
-        font.pixelSize:3*mm
-        x: 4*mm; y: 20*mm
-    }
-
-    Text {
-        text: qsTr("Password")
-        font.pixelSize:3*mm
-        x: 4*mm; y: 30*mm
-      }
-    Text {
-        text: qsTr("Image dir.")
-        font.pixelSize:3*mm
-        x: 4*mm; y: 40*mm
-     }
-
-    Text {
-        text: qsTr("Max. News")
-        font.pixelSize:3*mm
-        x: 4*mm; y: 50*mm
-     }
-    Text {
-        text: qsTr("News as")
-        font.pixelSize:3*mm
-        x: 4*mm; y: 60*mm
-    }
-    Text {
-        text: qsTr("Sync Interval (0=None)")
-        font.pixelSize:3*mm
-        //visible: false
-        x: 4*mm; y: 70*mm; //width:35*mm;wrapMode: Text.Wrap
-    }
-      
-//    Text {
-//          text: qsTr("Show Website")
-//          x: 4*mm; y:80*mm; width: 20*mm
-//    }
-
-    Image{
-        id:servericon
-        x:4*mm;y:13.5*mm
-        width:5*mm; height: 5*mm
-        visible: false
-        source:""
-        MouseArea{
-            anchors.fill:parent
-            onClicked:{
-                Service.showServerConfig(servername.text, configBackground, function(configString){
-                var serverconfigObject=Qt.createQmlObject(configString,configBackground,"serverconfigOutput");})
-            }
-        }
-    }
-
-    BlueButton{
-        id:serverSearchButton
-        text:"\uf002"
-        x:4*mm
-        y:13.5*mm
-        width: 5*mm; height:5*mm
-        visible: servericon.visible?false:true
-        onClicked:{Qt.openUrlExternally(Qt.resolvedUrl("https://dir.friendica.social/servers"))}
-    }
-
-    Rectangle{color: "light grey";  x: 10*mm; y: 13.5*mm; width: root.width-12*mm; height: 5*mm;}
-    Flickable {
-        id: servernameFlickable
-        x: 10*mm; y: 13.5*mm; width: root.width-12*mm; height: 5*mm;
-        contentWidth: servername.paintedWidth
-        contentHeight: servername.paintedHeight
-        clip: true
-        TextEdit {
-            id: servername
-            width: servernameFlickable.width
-            height: servernameFlickable.height
-            focus: true
-            font.pixelSize:3*mm
-            text:"https://..."
-            onEditingFinished:{
-                 if((servername.text).substring(0,14) =="https://...http"){
-                     serverstring.text= (serverstring.text).substring(11)
-                 }
-               configBackground.setServericon(servername.text)
-             }
-            onCursorRectangleChanged: Layoutjs.ensureVisibility(cursorRectangle,servernameFlickable)
-        }
-    }
-
-    Rectangle{
-        color: "light grey"
-        x: 4*mm; y: 23.5*mm; width: root.width-14*mm; height: 5*mm;
-        TextInput {
-            id: username
-            anchors.fill: parent
-            font.pixelSize:3*mm
-            selectByMouse: true
-            onEditingFinished:{
-                if (username.text.indexOf('@')>-1){
-                    Helperjs.showMessage(qsTr("Error"),qsTr("Nicknames containing @ symbol currently not supported"),configBackground)
-                }
-             //    Helperjs.friendicaWebRequest(servername.text+'/api/users/show?screen_name='+username.text,configBackground,function(obj){
-             //        var screennametest=JSON.parse(obj);
-            //         if (screennametest.hasOwnProperty('status')){
-            //              Helperjs.showMessage(qsTr("Error"),qsTr("Nickname not registered at given server!"),configBackground);
-           //              configBackground.registeredUser=false;
-           //          }else{configBackground.registeredUser=true}
-           //      });
-           //  }
-            }
-         }
-    }
-    BlueButton {
-        x: root.width-9*mm; y: 23.5*mm; width:7*mm
-        text: "\uf234"
-        onClicked: {
-            configStack.push({item:"qrc:/qml/configqml/RegisterPage.qml",properties:{url:servername.text+"/register?nickname="+username.getText(0,username.length)}})
-        }
-    }
-
-    Rectangle{
-        color: "light grey"
-         x: 4*mm; y: 33.5*mm; width: root.width-6*mm; height: 5*mm;
-         TextInput {
-             id: password
-             anchors.fill: parent
-             font.pixelSize:3*mm
-             selectByMouse: true
-             echoMode: TextInput.PasswordEchoOnEdit
-        }
-    }
-
-    Rectangle{color: "light grey"; x: 4*mm; y: 43.5*mm; width: root.width-14*mm; height: 5*mm;}
-    Flickable {
-         id: imagestoreFlickable
-         x: 4*mm; y: 43.5*mm; width: root.width-14*mm; height: 5*mm;
-         clip: true
-         TextInput {
-             id: imagestore
-             width: imagestoreFlickable.width
-             height: imagestoreFlickable.height
-             font.pixelSize:3*mm
-             wrapMode: TextEdit.NoWrap
-             onCursorRectangleChanged: Layoutjs.ensureVisibility(cursorRectangle,imagestoreFlickable)
-         }
-     }
-
-    FileDialog {
-        id: imagestoreDialog
-        title: "Please choose a directory"
-        folder: shortcuts.pictures
-        selectFolder: true
-        onAccepted: {
-            var imagestoreString=imagestoreDialog.folder.toString();
-            imagestoreString=imagestoreString.replace(/^(file:\/{2})/,"")+"/"
-            imagestore.text=imagestoreString
-        }
-    }
-
-     BlueButton {
-            x: root.width-9*mm; y: 43.5*mm; width: 7*mm; height: 5*mm;
-            text: "..."
-            onClicked:
-         {imagestoreDialog.open()}
-     }
-
-
-    Slider{ id: maxNews
-        x:19*mm; y: 53.5*mm;width: root.width/2;height:5*mm
-        minimumValue: 0;maximumValue:2000; stepSize: 100
-    }
-
-
-    Rectangle{color: "light grey"; x: 4*mm; y: 53.5*mm; width: 9*mm; height: 5*mm;
-        TextEdit{id:maxNewsText;
-            anchors.fill: parent
-            font.pixelSize:3*mm
-            verticalAlignment:TextEdit.AlignRight
-            text:maxNews.value
-            focus: true
-            selectByMouse: true
-        }
-    }
-
-    Rectangle{
-         x: 4*mm; y: 63.5*mm; width: newsTypeField.contentWidth+2*mm; height: 5*mm;
-         color:"light grey"
-         Text{
-             id: newsTypeField
-             anchors.fill: parent
-             font.pixelSize:3*mm
-             text:"Conversations"
-        }
-        MouseArea{
-            anchors.fill:parent
-            onClicked:newstypemenu.popup()
-        }
-    }
-    Slider{ id: messageIntervalSlider
-        x:22*mm; y: 73.5*mm;width: root.width/2;height:5*mm
-        minimumValue: 0;maximumValue:120; stepSize: 15
-    }
-    Rectangle{
-         x: 4*mm; y: 73.5*mm; width: 9*mm; height: 5*mm;
-         TextEdit{
-             id: messageIntervalField
-             anchors.fill: parent
-             font.pixelSize:3*mm
-             verticalAlignment:TextEdit.AlignRight
-             text:messageIntervalSlider.value
-             focus: true
-             selectByMouse: true
-        }
-    }
-    Text{x: 14*mm; y: 73.5*mm; width: 5*mm; height: 5*mm;
-        font.pixelSize:3*mm
-        text:qsTr("Min.")
-    }
-
-//    CheckBox{
-//        id:showwebsiteCheckbox
-//        x:35*mm;y:80*mm
-//        onClicked:{
-//            if (checked==true){
-//                Service.updateglobaloptions(root.db,"showWebsiteForLinks","true")
-//                root.globaloptions.showWebsiteForLinks="true"
-//            }
-//            else {
-//                Service.updateglobaloptions(root.db,"showWebsiteForLinks","false")
-//                root.globaloptions.showWebsiteForLinks="false"
-//            }
-//        }
-//    }
-
-    BlueButton {
-    x: 4*mm; y: 83.5*mm
-    text: qsTr("Confirm")
-    onClicked:{
-         var userconfig={server: servername.text, username: username.text, password:Qt.btoa(password.text), imagestore:imagestore.text,maxnews:maxNewsText.text,interval:  messageIntervalField.text, newsViewType:newsTypeField.text};
-         var errormessage="";
-         if (servername.text==""){errormessage=qsTr("No server given! ")}
-         else if (username.text==""){errormessage+=qsTr("No nickname given! ")}
-         else if ((configBackground.registeredUser==false)){errormessage+=qsTr("Nickname not registered at given server! ")}
-         else if (password.text=="") {errormessage+=qsTr("No password given! ")}
-         else if (imagestore.text=="") {errormessage+=qsTr("No image directory given!")}
-         else if (maxNewsText.text=="") {errormessage+=qsTr("No maximum news number given!")}
-         else {errormessage=""}
-         if (errormessage=="") {
-             Helperjs.friendicaRequest(userconfig,"/api/account/verify_credentials?skip_status=true",root,function(obj){
-                 var credentials=JSON.parse(obj);
-                 if (credentials.hasOwnProperty('status')){
-                     Helperjs.showMessage(qsTr("Error"),qsTr("Wrong password!"),root)
-                 }
-                 else{
-                     filesystem.Directory=userconfig.imagestore;
-                     filesystem.makeDir("contacts");
-                     filesystem.makeDir("albums");
-                     Service.storeConfig(db,userconfig);
-                     Service.readConfig(db,function(userconfig){
-                         Helperjs.readData(db,"config","",function(storedUsers){
-                            storedUsers.sort(function(obj1, obj2) {
-                                return obj1.isActive - obj2.isActive;
-                            });
-                         configBackground.users=storedUsers});
-                         userButton.color="black"
-                         //reset values
-                         root.login=userconfig;
-                         root.news=[];
-                     },"isActive",0);
-                     Service.requestProfile(userconfig,db,root,function(nc){root.newContacts=nc});
-                     if(osSettings.osType=="Android" && userconfig.timerInterval !=0){
-                             alarm.setAlarm(userconfig.timerInterval);
-                         }
-                     Helperjs.showMessage(qsTr("Success"),qsTr("Name")+": "+credentials.name+"\nScreen Name: "+credentials.screen_name,root)
-                 }
-             });
-
-        }
-         else {Helperjs.showMessage(qsTr("Error"), errormessage,root)}
-    }}
-
-
-
-    BlueButton {
-    x: root.width/2+2*mm; y: mm; width: 5*mm; height: 5*mm;
-    text: "-"
-    onClicked:{
-        var userconfig={server: servername.text, username: username.text, password: Qt.btoa(password.text)};
-        Service.deleteConfig(db,userconfig,function(){
-           filesystem.Directory=imagestore.text+"contacts";
-           filesystem.rmDir();
-           filesystem.Directory=imagestore.text+"albums";
-           filesystem.rmDir();
-           configBackground.registeredUser=true;
-           servername.text="https://...";
-           servericon.visible=false;
-           servericon.source="";
-           username.text="";
-           password.text="";
-           imagestore.text="";
-           maxNews.value=0;
-           newsTypeField.text="Conversations";
-           messageIntervalSlider.value=30;
-           userButton.text=qsTr("User");
-           Helperjs.readData(db,"config","",function(storedUsers){
-             storedUsers.sort(function(obj1, obj2) {
-                 return obj1.isActive - obj2.isActive;
-             })
-             configBackground.users=storedUsers;})
-       })
-    }}
-
-    BlueButton {
-    x: root.width/2+8*mm; y: mm; width: 5*mm; height: 5*mm;
-    text: "+"
-    onClicked:{
-        configBackground.registeredUser=true;
-        servername.text="https://..."
-        servericon.visible=false;
-        servericon.source="";
-        username.text=""
-        password.text=""
-        imagestore.text=""
-        maxNews.value=0
-        newsTypeField.text="Conversations"
-        messageIntervalSlider.value=30
-        userButton.text=qsTr("User")
-       }
-     }
-
-    BlueButton {
-        x: root.width/2+14*mm; y: mm; width: 5*mm; height: 5*mm;
-        text: "?"
-        onClicked:{
-                    configStack.push({item:"qrc:/qml/configqml/InfoBox.qml"});
-           }
-         }
-
-    Menu {
-        id:newstypemenu
-        MenuItem {
-            text: qsTr("Timeline")
-            onTriggered: {newsTypeField.text="Timeline"}
-            }
-        MenuItem {
-            text: qsTr("Conversations")
-            onTriggered: {newsTypeField.text="Conversations"}
-            }
-    }
-
-   Component.onCompleted: {
-      try{Helperjs.readData(db,"config","",function(storedUsers){
-          storedUsers.sort(function(obj1, obj2) {
-              return obj1.isActive - obj2.isActive;
-          })
-          configBackground.users=storedUsers;
-          Service.readConfig(db,function(obj){
-            userButton.text=obj.username;
-            servername.text=obj.server;
-            configBackground.setServericon(obj.server);
-            username.text= obj.username;
-            password.text=Qt.atob(obj.password);
-            imagestore.text=obj.imagestore;
-            maxNews.value=obj.maxnews;
-            newsTypeField.text=obj.newsViewType;
-            messageIntervalSlider.value=obj.timerInterval;
-            if( obj.isActive==0){userButton.fontColor='black'} else {userButton.fontColor='grey'}},"isActive",0
-            )
-          })
-//            Service.readGlobaloptions(db,function(go){
-//                if (root.globaloptions.showWebsiteForLinks!="false"){showwebsiteCheckbox.checked=true}
-//            })
-  
-          }
-      catch (e){print(e)
-          Helperjs.friendicaWebRequest("https://dir.friendica.social/servers/surprise",configBackground,function(html){
-              var bpos=html.indexOf("baseurl");
-              var baseurl=html.substring(html.indexOf("http",bpos),html.indexOf('"',html.indexOf("http",bpos)));
-              servername.text=baseurl
-          })}
-    }
-}
-}
-}
diff --git a/source-android/qml/configqml/InfoBox.qml b/source-android/qml/configqml/InfoBox.qml
deleted file mode 100644
index 31a9c57..0000000
--- a/source-android/qml/configqml/InfoBox.qml
+++ /dev/null
@@ -1,72 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.0
-import QtQuick.Controls 2.4
-import "qrc:/qml/genericqml"
-
-Rectangle{
-    color:"white"
-    width:infoBoxText.contentWidth
-    height:infoBoxText.contentHeight
-    Text{id:infoBoxText
-        anchors.top:closeButton.bottom
-        anchors.topMargin: mm
-        textFormat: Text.RichText
-        width: root.width-mm
-        wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-        text: "<b>Friendiqa v0.5 </b><br>Licensed under GPL 3 with the exception of OpenSSL <br> "+
-              "Profile <a href='https://freunde.ma-nic.de/profile/friendiqa'>https://freunde.ma-nic.de/profile/friendiqa</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>"+
-               "Most of C++ code by <a href='https://kirgroup.com/profile/fabrixxm'>Fabio</a><br>"+
-               "QML and Javascript code by <a href='https://freunde.ma-nic.de/profile/marco'>Marco</a><br>"+
-               "Qt Framework <a href='https://www.qt.io'>www.qt.io</a><br>"+
-               "Icons by <a href='http://fontawesome.io'>FontAwesome</a><br>"+
-               "Folder Icon by <a href='https://github.com/KDE/breeze-icons'>KDE Breeze Icons</a><br>"+
-               "AndroidNative by <a href='https://github.com/benlau/androidnative.pri'>Ben Lau</a><br>"+
-               "This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (<a href='http://www.openssl.org/'>http://www.openssl.org/</a>)"
-         onLinkActivated:{
-            Qt.openUrlExternally(link)}
-     }
-     Button{
-         id:closeButton
-         height: 6*mm
-         width: 8*mm
-         anchors.top: parent.top
-         anchors.topMargin: 1*mm
-         anchors.right: parent.right
-         anchors.rightMargin: 1*mm
-         text:   "\uf057"
-         font.pixelSize: 3*mm
-         onClicked:{root.pop()}
-     }
-}
diff --git a/source-android/qml/configqml/OSSettingsAndroid.qml b/source-android/qml/configqml/OSSettingsAndroid.qml
deleted file mode 100644
index 8dd7ec5..0000000
--- a/source-android/qml/configqml/OSSettingsAndroid.qml
+++ /dev/null
@@ -1,44 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick.Window 2.0
-import QtQuick 2.0
-QtObject{
-    property int appWidth: Screen.desktopAvailableWidth
-    property int appHeight: Screen.desktopAvailableHeight
-    property int backKey: Qt.Key_Back
-    //property string attachImageDir:filesystem.cameraPath+"/"
-    property string osType: "Android"
-    property string imagePickQml: "ImagePicker"
-    property string imagePicker:'import QtQuick 2.0; import "qrc:/qml/genericqml";'+
-                          imagePickQml+'{multiple : true;onReady: {attachImageURLs.push(imageUrl);'+
-                          'attachImage(imageUrl)}}'
-}
diff --git a/source-android/qml/configqml/OSSettingsLinux.qml b/source-android/qml/configqml/OSSettingsLinux.qml
deleted file mode 100644
index f2bd73c..0000000
--- a/source-android/qml/configqml/OSSettingsLinux.qml
+++ /dev/null
@@ -1,40 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.0
-QtObject{
-    property real appWidth: 500 
-    property real appHeight: 500
-    property int backKey: Qt.Key_Escape
-    property string osType: "Linux"
-    //property string attachImageDir:filesystem.homePath+"/Pictures/"
-    property string imagePickQml: "ImagePickerLinux"
-}
diff --git a/source-android/qml/configqml/RegisterPage.qml b/source-android/qml/configqml/RegisterPage.qml
deleted file mode 100644
index 35ab326..0000000
--- a/source-android/qml/configqml/RegisterPage.qml
+++ /dev/null
@@ -1,66 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.9
-import QtQuick.Controls 2.5
-import QtWebView 1.1
-import "qrc:/qml/genericqml"
-
-Rectangle{
-    color:"white"
-    //border.color: "light grey"
-    property alias url:htmlview.url
-    width:root.width-5*mm
-    height:root.height-12*mm
-
-    WebView {id:htmlview;
-        height:parent.height-7*mm
-        width:parent.width
-        y:7*mm
-        MouseArea {anchors.fill:parent;
-            onClicked:{
-                //print(url)
-            }
-        }
-        //onLoadingChanged: print(loadProgress)
-    }
-    Button{
-        id:closeButton
-        height:8*mm
-        anchors.top: parent.top
-        anchors.topMargin: 1*mm
-        anchors.right: parent.right
-        anchors.rightMargin: 1*mm
-        text:   "\uf057"
-        font.pixelSize: 3*mm
-        onClicked:{configStack.pop()}
-     }
-}
diff --git a/source-android/qml/configqml/SyncComponent.qml b/source-android/qml/configqml/SyncComponent.qml
deleted file mode 100644
index 05be915..0000000
--- a/source-android/qml/configqml/SyncComponent.qml
+++ /dev/null
@@ -1,87 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.11
-import QtQuick.Controls 2.4
-import "qrc:/qml/configqml"
-import "qrc:/js/service.js" as Service
-
-Rectangle{
-    color: "#EEEEEE" //Material.Grey
-    property string adapter: ""
-    width: parent.width
-    height: 12*mm
-    Label{
-        x: mm
-        y: 0.5*mm
-        font.pixelSize:3*mm
-        text: qsTr(adapter)
-    }
-    CheckBox{
-        id: syncCheckbox
-        x: mm
-        y: 5*mm
-        width:20*mm
-        checked:(globaloptions["sync_"+adapter]==1)?true:false
-               //style: CheckBoxStyle {
-        text: qsTr("sync")
-        font.pixelSize:3*mm
-        onClicked: {
-            toggle();
-            if(syncCheckbox.checked==true){
-                Service.updateglobaloptions(root.db,"sync_"+adapter,0);syncCheckbox.checked=false;
-            }
-            else{
-                Service.updateglobaloptions(root.db,"sync_"+adapter,1);syncCheckbox.checked=true;
-            }
-        }
-    }
-    CheckBox{
-            id: notifyCheckbox
-            x:25*mm
-            y: 5*mm
-            width:25*mm
-            enabled: adapter!="Notifications"
-            checked:(globaloptions["notify_"+adapter]==1)?true:false
-            text: qsTr("notify")
-            font.pixelSize:3*mm
-            onClicked: {
-                toggle();
-                if(notifyCheckbox.checked==true){
-                    Service.updateglobaloptions(root.db,"notify_"+adapter,0);notifyCheckbox.checked=false;
-                }
-                else{
-                    Service.updateglobaloptions(root.db,"notify_"+adapter,1);notifyCheckbox.checked=true;
-            }
-        }
-    }
-}
diff --git a/source-android/qml/configqml/SyncConfig.qml b/source-android/qml/configqml/SyncConfig.qml
deleted file mode 100644
index 9f42fe8..0000000
--- a/source-android/qml/configqml/SyncConfig.qml
+++ /dev/null
@@ -1,101 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.11
-import QtQuick.Controls 2.4
-import "qrc:/qml/configqml"
-import "qrc:/js/service.js" as Service
-
-Rectangle{
-    color:"white"
-    width:root.width
-    height:root.height
-    Text {
-        text: qsTr("Sync Interval (0=None)")
-        font.pixelSize:3*mm
-        //visible: false
-        x: 4*mm; y: 10*mm; //width:35*mm;wrapMode: Text.Wrap
-    }
-
-    Slider{ id: messageIntervalSlider
-        x:22*mm; y: 13.5*mm;width: root.width/2;height:5*mm
-        value: globaloptions.syncinterval
-        from: 0;to:120; stepSize: 15
-    }
-    Rectangle{
-         x: 4*mm; y: 13.5*mm; width: 9*mm; height: 5*mm;
-         TextEdit{
-             id: messageIntervalField
-             anchors.fill: parent
-             font.pixelSize:3*mm
-             verticalAlignment:TextEdit.AlignRight
-             text:messageIntervalSlider.value
-             focus: true
-             selectByMouse: true
-             onTextChanged: {
-                 Service.updateglobaloptions(root.db,"syncinterval",text);
-                 if(osSettings.osType=="Android" && text !=0){
-                    alarm.setAlarm(text);
-                    } else if(osSettings.osType=="Linux" && text !=0){
-
-                    }
-             }
-        }
-    }
-    Text{x: 14*mm; y: 13.5*mm; width: 5*mm; height: 5*mm;
-        font.pixelSize:3*mm
-        text:qsTr("Min.")
-    }
-
-    Column{
-        y:22*mm
-        width: parent.width
-        spacing:mm
-        //anchors.fill: parent
-        SyncComponent{adapter:"Timeline"}
-        SyncComponent{adapter:"Replies"}
-        SyncComponent{ adapter:"DirectMessages"}
-        SyncComponent{ adapter:"Notifications"}
-    }
-
-     Button{
-         id:closeButton
-         anchors.top: parent.top
-         anchors.topMargin: 1*mm
-         anchors.right: parent.right
-         anchors.rightMargin: 1*mm
-         height: 6*mm
-         width: 8*mm
-         text:   "\uf057"
-         font.pixelSize: 3*mm
-         onClicked:{root.pop()}
-     }
-}
diff --git a/source-android/qml/contactqml b/source-android/qml/contactqml
new file mode 120000
index 0000000..3468d4f
--- /dev/null
+++ b/source-android/qml/contactqml
@@ -0,0 +1 @@
+./../../source-linux/qml/contactqml/
\ No newline at end of file
diff --git a/source-android/qml/contactqml/ContactDetailsComponent.qml b/source-android/qml/contactqml/ContactDetailsComponent.qml
deleted file mode 100644
index cd5112c..0000000
--- a/source-android/qml/contactqml/ContactDetailsComponent.qml
+++ /dev/null
@@ -1,176 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.0
-import QtQuick.Controls 2.4
-import "qrc:/qml/genericqml"
-
-Item {
-id: contactLargeComponent
-x:mm
-y:mm
-property var contact:({})
-property var createdAtDate: new Date(contact.created_at)
-property string connectUrl: (contact.network!=="dfrn")||(contact.isFriend!=0)?"":( "<a href='"+contact.url.replace("profile","dfrn_request") +"'>"+qsTr("Connect")+"</a><br>")
-
-Rectangle {
-    id: wrapper
-
-    width:root.width-2*mm //friendsTabView.width;
-    height:root.height-20*mm// friendsTabView.height-15*mm
-    border.color:  "grey"
-    color:"white"
-    Image {
-        id: photoImage
-        x:mm
-        y:mm
-        width: 15*mm
-        height:15*mm
-        source:(contact.profile_image!="")? "file://"+contact.profile_image : contact.profile_image_url
-        onStatusChanged: if (photoImage.status == Image.Error) {source="qrc:/images/defaultcontact.jpg"}
-        }
-
-    Label {
-        id: namelabel
-        x: mm
-        width: root.width-6*mm //friendsTabView.width-4*mm
-        height: 3*mm
-        text:contact.name+" (@"+contact.screen_name+")"
-        elide:Text.ElideRight
-        anchors.topMargin: 0
-        anchors.left: photoImage.left
-        color: "#303030"
-        font.pixelSize: 4*mm
-        anchors.top: photoImage.bottom
-        }
-Rectangle{
-   id: detailsrectangle
-   anchors.top: namelabel.bottom
-   anchors.topMargin: 2*mm
-
-   ScrollView{
-       horizontalScrollBarPolicy:Qt.ScrollBarAlwaysOff
-       //frameVisible: true
-       id:namelabelflickable
-       width: root.width-10*mm
-       height:root.height-50*mm
-       x: mm
-       clip:true
-       Text{
-           id:namelabeltext
-           width: namelabelflickable.width
-           height: implicitHeight
-           font.pixelSize: 3*mm
-           textFormat:Text.RichText
-           wrapMode: Text.Wrap
-           text:"<b>"+qsTr("Description")+": </b> "+contact.description+"<br> <b>"+qsTr("Location")+":</b> "+contact.location+"<br> <b>"+qsTr("Posts")+":</b> "+contact.statuses_count+
-               "<br> <b>"+qsTr("URL")+":</b> <a href='"+ contact.url+"'>"+contact.url+"</a><br>"+
-               connectUrl+ "<b>"+qsTr("Created at")+":</b> "+createdAtDate.toLocaleString(Qt.locale())
-            onLinkActivated: {
-              Qt.openUrlExternally(link)}
-            }
-        }
-
-        Row{
-            anchors.top: namelabelflickable.bottom
-            anchors.topMargin: 2*mm
-            x: mm
-            spacing:4
-
-            MButton{
-                id:photobutton
-                height: 6*mm
-                width: 8*mm
-                text: "\uf03e" // "Photos"
-                visible:(contact.network=="dfrn")
-                onClicked:{
-                    fotostab.phototabstatus="Contact";
-                    root.currentIndex=2;
-                    fotostab.active=true;
-                    root.fotoSignal(contact) ;
-                    contactLargeComponent.destroy();
-                    }
-             }
-
-            MButton{
-                id:messagebutton
-                height: 6*mm
-                width: 8*mm
-                text: "\uf0e6" //"Messages"
-                onClicked:{
-                    root.currentIndex=0;
-                    //newstab.active=true;
-                    root.messageSignal(contact) ;
-                    contactLargeComponent.destroy();
-                }
-            }
-
-            MButton{
-                id:dmbutton
-                visible: (contact.following=="true")
-                height: 6*mm
-                width: 8*mm
-                text: "\uf040" //"DM"
-                onClicked:{
-                    root.currentIndex=0;
-                    root.directmessageSignal(contact.screen_name);
-                    contactLargeComponent.destroy();
-                }
-            }
-
-
-            Button{
-                id:eventbutton
-                visible:(contact.network=="dfrn")
-                height: 6*mm
-                width: 8*mm
-                text:"\uf073" //Events
-                onClicked:{
-                    root.currentIndex=3;
-                    calendartab.active=true;
-                    calendartab.calendartabstatus="Friend"
-                    root.eventSignal(contact);
-                    contactLargeComponent.destroy();
-                }
-            }
-
-            Button{
-                id: closeButton
-                height: 6*mm
-                width: 8*mm
-                text: "\uf057" //"close"
-                onClicked:{contactLargeComponent.destroy();
-                }
-            }
-        }
-    }
-}
-}
diff --git a/source-android/qml/contactqml/Contactlist.qml b/source-android/qml/contactqml/Contactlist.qml
deleted file mode 100644
index 67564ca..0000000
--- a/source-android/qml/contactqml/Contactlist.qml
+++ /dev/null
@@ -1,135 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-// List of people
-import QtQuick 2.0
-import QtQuick.Controls 2.5
-import "qrc:/js/helper.js" as Helperjs
-import "qrc:/qml/genericqml"
-
-Rectangle {
-    id:contactlistRectangle
-    property var contacts:[]
-    property var possibleUsers: []
-    //y:8*mm
-    color: "white"
-    border.color: "light grey"
-    radius:0.5*mm
-    width:groupListView.width
-    height:groupListView.height
-
-    ListView {
-          id: contactView
-          x:mm
-          y:6*mm
-          width: contactlistRectangle.width-2*mm
-          height: contactlistRectangle.height-10*mm
-          clip: true
-          spacing: 0
-          model: contactModel
-          delegate: listContact
-          }
-
-       ListModel{id: contactModel}
-
-       Component {  id:listContact
-               Rectangle{
-                  border.color: "#EEEEEE"
-                  border.width: 1
-                  radius:0.5*mm
-                  width:contactView.width
-                  height:6*mm
-                  Image {
-                      id: contactImage
-                      x:1
-                      y:1
-                      width: 5*mm
-                      height:5*mm
-                      source:(contact.profile_image!="")? "file://"+contact.profile_image : contact.profile_image_url
-                      onStatusChanged: if (contactImage.status == Image.Error) {source="qrc:/images/defaultcontact.jpg"}
-                      }
-                  Text{
-                    font.pixelSize: 3*mm
-                    anchors.left: contactImage.right
-                    anchors.margins: 1*mm
-                    text:Qt.atob(contact.name)
-                  }
-            Text {
-                id:selected
-                anchors.right:parent.right
-                visible: contactlist.indexOf(contact)>-1
-                z:4
-                text: "\u2713"
-                width: 5*mm
-                anchors.top: parent.top
-                color: "green"
-                font.pixelSize: 3*mm
-            }
-
-           MouseArea{
-                anchors.fill: parent
-                onClicked:{
-                    if(selected.visible==true){
-                                contacts.splice(Helperjs.inArray(contacts,"id",contact.id),1);
-                                selected.visible=false
-                            }
-                            else{
-                                contacts.push(contact);
-                                selected.visible=true;
-                            }
-                        }
-                 }
-            }
-           }
-
-   MButton {
-            id: closeButton
-            height:6* mm
-            width: 8*mm
-            anchors.top: parent.top
-            anchors.topMargin: 1*mm
-            anchors.right: parent.right
-            anchors.rightMargin: 1*mm
-            //color:"white"
-            text: "\uf057"
-            onClicked: {
-               groupModelAppend(contacts,function(){
-                   contactlistRectangle.destroy()
-                 });
-            }
-    }
-
-    Component.onCompleted: {
-        for (var user in possibleUsers){
-            contactModel.append({"contact":possibleUsers[user]})
-        }
-    }
-}
diff --git a/source-android/qml/contactqml/FriendsTab.qml b/source-android/qml/contactqml/FriendsTab.qml
deleted file mode 100644
index 41741e7..0000000
--- a/source-android/qml/contactqml/FriendsTab.qml
+++ /dev/null
@@ -1,392 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.11
-import QtQuick.Controls 2.4
-//import QtQuick.Controls.Styles 1.4
-import QtQuick.Layouts 1.11
-import QtQuick.LocalStorage 2.0
-import "qrc:/js/helper.js" as Helperjs
-import "qrc:/js/news.js" as Newsjs
-import "qrc:/js/service.js" as Service
-import "qrc:/qml/contactqml"
-import "qrc:/qml/genericqml"
-
-Rectangle {
-    y:1
-    color: "white"
-
-    function showContactdetails(contact){
-        var component = Qt.createComponent("qrc:/qml/contactqml/ContactDetailsComponent.qml");
-        if(contact.isFriend){
-            friendsTabView.currentIndex=1;
-           var contactDetails = component.createObject(friendstab,{"contact": contact})
-        }
-        else{friendsTabView.currentIndex=2;
-           var contactDetails = component.createObject(friendstab,{"contact": contact})
-        }
-    }
-
-    function showProfile(callback){
-        var profile=({});
-        Helperjs.readData(db,"profiles",login.username,function(profileobject){
-            var profilearray=[];
-            for (var i in profileobject){
-                profilearray.push(JSON.parse(Qt.atob(profileobject[i].profiledata)));
-            }
-            profile.profiles=profilearray;
-        });
-        Helperjs.readData(db,"contacts",login.username,function(owner){
-            profile.friendica_owner=owner[0];
-        },"isFriend",2);
-        callback(profile)
-    }
-
-    TabBar {
-      id: friendsbar
-      width: parent.width
-      height: 9*mm
-      position:TabBar.Header
-      currentIndex: 1
-      TabButton {
-          text: qsTr("Me")
-          font.pixelSize: 2*mm
-      }
-      TabButton {
-          text:  qsTr("Friends")
-          font.pixelSize: 2*mm
-      }
-      TabButton {
-          text:  qsTr("Contacts")
-          font.pixelSize: 2*mm
-      }
-      TabButton {
-          text: qsTr("Groups")
-          font.pixelSize: 2*mm
-      }
-  }
-    StackLayout{
-        id:friendsTabView
-        //anchors.fill: parent
-        x:mm
-        y:10*mm
-        width: parent.width-2*mm
-        height: parent.height-10*mm
-        currentIndex: friendsbar.currentIndex
-        signal contactsSignal(var contact)
-        signal groupsSignal(var username)
-        onCurrentIndexChanged:{
-            if (currentIndex==1){
-                contactsSignal("")
-            }
-            else if (currentIndex==2){
-                contactsSignal("")
-            }
-            else if (currentIndex==3){groupsSignal(root.login.username)}
-        }
-//        style: TabViewStyle {
-//            frameOverlap: 1
-//            tab: Rectangle {
-//               color: "white"
-//               implicitWidth: root.width/4-2*mm
-//               implicitHeight: 4*mm
-//               Text { id: text
-//                  anchors.centerIn: parent
-//                  text: styleData.title
-//                  color: "dark grey"
-//                  font.pixelSize:2.5*mm
-//                  font.bold: styleData.selected
-//               }
-//            }
-//            frame: Rectangle { color: "light grey" }
-//            tabsAlignment:Qt.AlignHCenter
-//         }
-
-      Item{
-          id:profileGridTab
-          Layout.fillWidth:true
-          Layout.fillHeight: true
-          Component.onCompleted:{
-                showProfile(function(profile){
-                    var component = Qt.createComponent("qrc:/qml/contactqml/ProfileComponent.qml");
-                    var profilecomp = component.createObject(profileGridTab,{"profile": profile});
-                });
-            }
-      }
-
-        Item{
-            id: friendsGridTab
-            Layout.fillWidth:true
-            Layout.fillHeight: true
-            property int currentContact: 0
-            function showFriends(contact){
-                try {friendsModel.clear()} catch(e){print(e)};
-                Helperjs.readData(root.db,"contacts",login.username,function(friendsobject){
-                    for (var i=0;i<friendsobject.length;i++){
-                        friendsobject[i].description=Qt.atob(friendsobject[i].description);
-                        friendsobject[i].name=Qt.atob(friendsobject[i].name);
-                         if(Helperjs.getCount(db,login,"contacts","screen_name",friendsobject[i].screen_name)>1){
-                            friendsobject[i].screen_name=friendsobject[i].screen_name+"+"+friendsobject[i].cid
-                        }
-                        friendsModel.append({"contact":friendsobject[i]});
-                    }
-                },"isFriend",1,"screen_name ASC");
-               }
-        Connections{
-            target:xhr
-            onDownloaded:{
-                if(type=="contactlist"){
-                    //print(url+" "+filename+" "+i)
-                    friendsGridTab.currentContact=i+1;
-                    if(friendsGridTab.currentContact==root.newContacts.length){
-                        friendsGridTab.showFriends(root.login.username)
-                    }
-                }
-            }
-        }
-        MButton {
-            id: updateFriendsButton
-            text:  "\uf021"
-            anchors.top: parent.top
-            anchors.topMargin: mm
-            anchors.right: parent.right
-            height: 6*mm
-            width: 8*mm
-            onClicked: {
-                try {friendsModel.clear()} catch(e){print(e)};
-                //root.contactLoadType="friends";
-                Newsjs.requestFriends(root.login,db,root,function(nc){
-                    root.newContacts=nc
-                })
-            }
-        }
-
-            ProgressBar{
-                id: newContactsProgress
-                width: 15*mm
-                height: updateFriendsButton.height
-                anchors.top: parent.top
-                anchors.right:updateFriendsButton.left
-                anchors.rightMargin:mm
-                visible: (friendsGridTab.currentContact!=(root.newContacts.length))?true:false
-                value: friendsGridTab.currentContact/root.newContacts.length
-            }
-
-            //GridView {
-            ListView{
-              id: friendsView
-              x:mm
-              y:updateFriendsButton.height+2*mm
-              width:friendsGridTab.width-2*mm
-              height:friendsGridTab.height-updateFriendsButton.height-2*mm
-              clip: true
-              spacing: 2
-              //add: Transition {
-               //        NumberAnimation { properties: "x,y"; from: 300; duration: 1000 }
-               //    }
-              model: friendsModel
-              delegate: ContactComponent { }
-             }
-
-            ListModel{id:friendsModel}
-
-        Component.onCompleted: {
-            root.friendsSignal.connect(showFriends);
-            friendsTabView.contactsSignal.connect(showFriends);
-            showFriends(root.login.username);
-            root.newContacts=[]
-            }
-        }
-
-    Item{
-        id: contactsGridTab
-        Layout.fillWidth:true
-        Layout.fillHeight: true
-            function showContacts(contact){
-                try {contactsModel.clear()} catch(e){print(e)};
-                Helperjs.readData(db, "contacts",root.login.username,function(contactsobject){
-                for (var j=0;j<contactsobject.length;j++){
-                    contactsobject[j].description=Qt.atob(contactsobject[j].description);
-                    contactsobject[j].name=Qt.atob(contactsobject[j].name);
-                     contactsModel.append({"contact":contactsobject[j]});
-                    }
-                },"isFriend",0,"screen_name ASC");
-            }
-            MButton {
-                id: cleanButton
-                text:  "\uf021"
-                anchors.top: parent.top
-                anchors.topMargin: mm
-                anchors.right: parent.right
-                height: 6*mm
-                width: 8*mm
-                onClicked: {
-                    Service.cleanContacts(root.login,root.db,function(){
-                        try {contactsModel.clear()} catch(e){print(e)};
-                        Helperjs.readData(db, "contacts",root.login.username,function(contactsobject){
-                        for (var j=0;j<contactsobject.length;j++){
-                            contactsobject[j].description=Qt.atob(contactsobject[j].description);
-                            contactsobject[j].name=Qt.atob(contactsobject[j].name);
-                             contactsModel.append({"contact":contactsobject[j]});
-                            }
-                        },"isFriend",0,"screen_name ASC");
-
-                    })
-                }
-            }
-             ListView {
-                 id: contactsView
-                 x:mm
-                 y:cleanButton.height+2*mm
-                 width:contactsGridTab.width-2*mm
-                 height:contactsGridTab.height-cleanButton.height-2*mm
-                 clip: true
-                 //add: Transition {
-                  //        NumberAnimation { properties: "x,y"; from: 300; duration: 1000 }
-                  //    }
-                 model: contactsModel
-                 delegate: ContactComponent { }
-                 }
-
-             ListModel{id: contactsModel}
-             Component.onCompleted: {
-                friendsTabView.contactsSignal.connect(showContacts);
-             }
-        }
-
-
-        Item{
-            id: groupsGridTab
-            Layout.fillWidth:true
-            Layout.fillHeight: true
-
-            function showGroups(username){
-                try {groupsModel.clear()} catch(e){print(e)};
-                Helperjs.readData(db, "groups",root.login.username,function(groupsobject){
-                  for (var j=0;j<groupsobject.length;j++){
-                      groupsModel.append({"group":groupsobject[j]});
-            }})}
-
-            function updateGroup(login,database,group){
-               // update groups
-                //var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-                //var groupdata={"gid":group.id,"name":group.name,"user":group.user};
-                //print("Groupdata  "+JSON.stringify(group));
-                var api="";
-                if (group.new){api="/api/friendica/group_create.json?name="+group.name}else{api="/api/friendica/group_update.json?gid="+group.id}
-                xhr.url= login.server + api;
-                xhr.setLogin(login.username+":"+Qt.atob(login.password));
-                xhr.clearParams();
-                xhr.setParam("gid",group.id);
-                xhr.setParam("name",group.name);
-                xhr.setParam("user", group.user);
-                xhr.setParam("json",group);
-                xhr.post();
-            }
-
-            Connections{
-                target:xhr
-                onError:{print(data)}//if (data=="image"){Helperjs.showMessage()}}
-                onSuccess:{print("gruppe "+data);
-                    Newsjs.requestGroups(root.login,root.db,root,function(){
-                        showGroups(root.login.username)});
-                }
-            }
-            MButton {
-                id: updateGroupsButton
-                text: "\uf021"
-                anchors.top: parent.top
-                anchors.topMargin: mm
-                anchors.right: parent.right
-                anchors.rightMargin: mm
-                height: 6*mm
-                width: 8*mm
-                onClicked: {
-                    Newsjs.requestGroups(root.login,root.db,root,function(){
-                        groupsGridTab.showGroups(root.login.username)})}
-            }
-//            BlueButton {
-//                id: newGroupButton
-//                text: "\uf234"
-//                anchors.top: parent.top
-//                anchors.topMargin: mm
-//                anchors.right: updateGroupsButton.left
-//                anchors.rightMargin: mm
-//                onClicked: {
-//                    groupsModel.append({"group": {"new":true}});
-//                }
-//            }
-            GridView {
-                id: groupsView
-                x:mm
-                y:updateGroupsButton.height+2*mm
-                width:groupsGridTab.width-2*mm
-                height:groupsGridTab.height-updateGroupsButton.height-2*mm
-                clip: true
-                cellHeight: 16*mm
-                cellWidth: 17*mm
-                add: Transition {
-                     NumberAnimation { properties: "x,y"; from: 300; duration: 1000 }
-                    }
-                model: groupsModel
-                delegate: GroupComponent {}
-                //footer:groupFooter
-                }
-            ListModel{
-                id: groupsModel
-            }
-//            Component{
-//                id: groupFooter
-//                Image{
-//                    id: footerImage
-//                    width: 15*mm
-//                    height: 15*mm
-//                    fillMode: Image.PreserveAspectFit
-//                    source:"qrc:/images/addImage.png"
-//                    MouseArea{
-//                        anchors.fill: parent
-//                        onClicked:{
-//                            print("new group")
-//                            var component = Qt.createComponent("qrc:/qml/contactqml/GroupComponent.qml");
-//                            var imagedialog = component.createObject(groupsView,{"group": []});}
-//                    }
-//                }
-//            }
-            Component.onCompleted: {
-                friendsTabView.groupsSignal.connect(showGroups);
-            }
-        }
-
-}
-    Component.onCompleted: {
-         //root.contactdetailsSignal.connect(showContactdetails);
-    }
-}
diff --git a/source-android/qml/contactqml/GroupComponent.qml b/source-android/qml/contactqml/GroupComponent.qml
deleted file mode 100644
index 4d33790..0000000
--- a/source-android/qml/contactqml/GroupComponent.qml
+++ /dev/null
@@ -1,269 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.11
-import QtQuick.Controls 2.4
-import "qrc:/js/helper.js" as Helperjs
-import "qrc:/js/news.js" as Newsjs
-import "qrc:/qml/genericqml"
-
-Item {
-    id: groupComponent
-    property var groupmembers:[]
-    //property bool newGroup: false
-    function groupModelAppend(groupcontacts,callback){
-       for (var n in groupcontacts){
-        groupModel.append({"groupmember":groupcontacts[n]});}
-        callback()
-    }
-
-    Rectangle {
-        id: wrapper
-        width: 16*mm
-        height: 15*mm
-        border.color:  "grey"
-        color:"white"
-
-        Image {
-            id: photoImage
-            x:1
-            y:1
-            width: 10*mm
-            height:10*mm
-            source:"qrc:/images/defaultcontact.jpg"
-        }
-        Rectangle{
-            id:namelabelRect
-            x: 1
-            width: wrapper.width-2
-            height: 3.5*mm
-            anchors.top: photoImage.bottom
-            border.color: "light grey"
-            TextInput {
-                id: namelabel
-                anchors.fill: parent
-                readOnly: true
-                text: group.new?"":group.groupname
-                color: "#303030"
-                font.pixelSize: 3*mm
-
-            }
-        }
-        
-       MButton{
-            id: closeButton
-            visible: false
-            width: 8*mm
-            height: 6*mm
-            anchors.left: infobutton.right
-            anchors.margins: mm
-            anchors.top: parent.top
-            
-            text: "\uf057"
-            font.pixelSize: 3*mm
-                    onClicked:{groupComponent.state="";
-                        if (group.new){groupsModel.remove(index)}
-                    }
-        }
-        
-        MButton{
-            id:infobutton
-            width: 4*mm
-            height: 6*mm
-
-            //color:"transparent"
-            text:"?"
-            font.pixelSize: 3*mm
-            anchors.left: photoImage.right
-            anchors.leftMargin: mm
-            anchors.topMargin: mm
-            anchors.top: parent.top
-            onClicked:{
-                //if(group.new){
-                    Helperjs.readField("members",root.db,"groups",root.login.username,function(groups){
-                    try {groupModel.clear()}catch (e){print(e)}
-                    groupmembers=JSON.parse(groups);
-                    for (var user in groupmembers){
-                        Helperjs.readData(root.db,"contacts",root.login.username,function(userdata){
-                            if (userdata[0]){
-                                userdata[0].name=Qt.atob(userdata[0].name);
-                                userdata[0].description=Qt.atob(userdata[0].description)
-                                groupModel.append({"groupmember":userdata[0]
-                            })}
-                        },"id",groupmembers[user])
-                    } //catch(e){}
-                },"groupname",group.groupname);
-                //}
-                groupComponent.state="large"
-            }
-        }
-
-        Rectangle{
-            id: detailsrectangle
-            anchors.top: namelabelRect.bottom
-            anchors.topMargin: mm
-            opacity: 0
-
-            Component {
-                id:groupMember
-                Rectangle{
-                    width:parent.width
-                    height:6*mm
-                    Rectangle{id:memberrectangle
-                        border.color: "#EEEEEE"
-                        border.width: 1
-                        width:parent.width-12*mm
-                        height:6*mm
-                        Image {
-                            id: memberImage
-                            x:1
-                            y:1
-                            width: 5*mm
-                            height:5*mm
-                            source:(groupmember.isFriend==1)? "file://"+groupmember.profile_image :groupmember.profile_image_url
-                            onStatusChanged: if (photoImage.status == Image.Error) {source="qrc:/images/defaultcontact.jpg"}
-                            }
-                        Text{
-                            font.pixelSize: 3*mm
-                            anchors.left: memberImage.right
-                            anchors.margins: 1*mm
-                            width:parent.width-1
-                            text:groupmember.name
-                        }
-                        MouseArea{
-                            anchors.fill: parent
-                            onClicked:{
-//                                root.currentIndex=1;
-//                                friendstab.active=true;
-//                                root.contactdetailsSignal(groupmember)
-                                root.currentIndex=0;
-                                root.contactdetailsSignal(groupmember)
-                            }
-                        }
-                       // BlueButton{
-                       //     anchors.left: memberrectangle.right
-                       //     anchors.margins: 1*mm
-                       //     text: "\uf056"
-                       //     onClicked:{
-                       //         groupModel.remove(index)
-                       //     }
-                       // }
-                    }
-                }
-            }
-
-            ListView{
-                id: groupListView
-                x:1
-                //anchors.top: parent.top
-                width: root.width-10*mm
-                height:groupsView.height - 24*mm
-                clip: true
-                spacing: 2
-                model: groupModel
-                delegate: groupMember
-            }
-
-            ListModel{id: groupModel}
-
-            Row{
-                anchors.top: groupListView.bottom
-                anchors.topMargin: mm
-                spacing: mm
- 
-                }
-
-//                BlueButton{
-//                    id:  addMembers
-//                    text:"\uf234"
-//                    onClicked: {
-//                        Newsjs.listFriends(root.login,root.db,function(userdata){
-//                            var newlistcontacts=[];
-//                            for (var n in userdata){
-//                                if (groupmembers.indexOf(userdata[n].id)==-1){
-//                                    newlistcontacts.push(userdata[n])
-//                                }
-//                            }
-//                            var component = Qt.createComponent("qrc:/qml/contactqml/Contactlist.qml");
-//                            var contactlistobject = component.createObject(groupListView,{"possibleUsers":newlistcontacts});
-
-//                        })
-//                    }
-//                }
-
-//                BlueButton{
-//                    id: updateButton
-//                    text: "\uf0ee"
-//                    onClicked:{
-//                        var groupobject={};
-//                        var groupmembers=[];
-//                        for (var i=0;i<groupModel.count;i++){groupmembers.push(groupModel.get(i).groupmember)}
-//                        try{ groupobject.id=group.gid} catch(e){};
-//                        try{ groupobject.new=group.new} catch(e){};
-//                        if (namelabel.text==""){
-//                            Helperjs.showMessage(qsTr("Error"),qsTr("No name given"),root)}
-//                        else {
-//                            groupobject.name=namelabel.text;
-//                            groupobject.user=groupmembers;
-//                            updateGroup(login,db,groupobject)
-//                            groupComponent.state="";
-//                        }
-//                    }
-//                }
-//                BlueButton{
-//                    id: deleteButton
-//                    text: "\uf056"
-//                    onClicked:{
-//                        Newsjs.deleteGroup(root.login,root.db,root,group,function(){
-//                            groupComponent.state="";
-//                            groupsModel.remove(index)})
-//                    }
-//                }
-
-        }
-    Component.onCompleted:{if(group.new){groupComponent.state="large"}}
-    }
-
-    states: [
-        State {
-            name: "large"
-            PropertyChanges { target: namelabel; font.pixelSize: 4*mm; width:groupsView.width; readOnly:false}
-            PropertyChanges { target: namelabelRect; height: 4.5*mm}
-            PropertyChanges { target: closeButton; visible: true}
-            PropertyChanges { target: groupComponent; z: 2  }
-            PropertyChanges { target: wrapper; width:groupsView.width;height:groupsView.height -2*mm-1}
-            PropertyChanges { target: photoImage; width:15*mm;height:15*mm }
-            PropertyChanges { target:groupComponent.GridView.view ;contentY:groupComponent.y;contentX:groupComponent.x;interactive:false}
-            PropertyChanges { target: detailsrectangle; opacity:1  }
-            PropertyChanges { target: infobutton; visible: false}
-            }
-    ]
-}
diff --git a/source-android/qml/contactqml/ProfileComponent.qml b/source-android/qml/contactqml/ProfileComponent.qml
deleted file mode 100644
index a2b5b09..0000000
--- a/source-android/qml/contactqml/ProfileComponent.qml
+++ /dev/null
@@ -1,285 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.0
-import QtQuick.Controls 2.4
-import "qrc:/qml/genericqml"
-import "qrc:/js/service.js" as Service
-
-Rectangle {
-//    width:parent.width-2*mm
-//    height:parent.height-14*mm
-    anchors.fill:parent
-    color:"white"
-    property var profile:({})
-    property var attachImageURLs:[]
-    property var createdAtDate: new Date(profile.friendica_owner.created_at)
-
-    function updateProfileImage(){
-        xhr.url= login.server + "/api/account/update_profile_image.json";
-        xhr.setLogin(login.username+":"+Qt.atob(login.password));
-        xhr.clearParams();
-        xhr.setImageFileParam("image", photoImage.source );
-        xhr.post();
-     }
-
-    function buildProfiletext(pobject,callback){
-        var profileobject={};
-        var profiletext="";
-        for (var key in pobject){//print(key+obj[key])
-            if(pobject[key]!=""&&key!="users"&&key!="profile_id"){
-                var keytext="";
-                switch(key){
-                    case "profile_name":keytext=qsTr("profile name");break;
-                    case "is_default":keytext=qsTr("is default");break;
-                    case "hide_friends":keytext=qsTr("hide friends");break;
-                    case "profile_photo":keytext=qsTr("profile photo");break;
-                    case "profile_thumb":keytext=qsTr("profile thumb");break;
-                    case "publish":keytext=qsTr("publish");break;
-                    case "net_publish":keytext=qsTr("publish in network");break;
-                    case "description":keytext=qsTr("description");break;
-                    case "date_of_birth":keytext=qsTr("date of birth");break;
-                    case "address":keytext=qsTr("address");break;
-                    case "city":keytext=qsTr("city");break;
-                    case "region":keytext=qsTr("region");break;
-                    case "postal_code":keytext=qsTr("postal code");break;
-                    case "country":keytext=qsTr("country");break;
-                    case "hometown":keytext=qsTr("hometown");break;
-                    case "gender":keytext=qsTr("gender");break;
-                    case "marital":keytext=qsTr("marital status");break;
-                    case "marital_with":keytext=qsTr("married with");break;
-                    case "marital_since":keytext=qsTr("married since");break;
-                    case "sexual":keytext=qsTr("sexual");break;
-                    case "politic":keytext=qsTr("politics");break;
-                    case "religion":keytext=qsTr("religion");break;
-                    case "public_keywords":keytext=qsTr("public keywords");break;
-                    case "private_keywords":keytext=qsTr("private keywords");break;
-                    case "likes":keytext=qsTr("likes");break;
-                    case "dislikes":keytext=qsTr("dislikes");break;
-                    case "about":keytext=qsTr("about");break;
-                    case "music":keytext=qsTr("music");break;
-                    case "book":keytext=qsTr("book");break;
-                    case "tv":keytext=qsTr("tv");break;
-                    case "film":keytext=qsTr("film");break;
-                    case "interest":keytext=qsTr("interest");break;
-                    case "romance":keytext=qsTr("romance");break;
-                    case "work":keytext=qsTr("work");break;
-                    case "education":keytext=qsTr("education");break;
-                    case "social_networks":keytext=qsTr("social networks");break;
-                    case "homepage":keytext=qsTr("homepage");break;
-                    default:keytext=key;
-                }
-                profiletext=profiletext+("<b>"+keytext+": </b> "+(pobject[key])+"<br>");
-            }
-        }
-        callback(profiletext)
-    }
-
-    MButton {
-        id: update
-        height: 6*mm
-        width: 8*mm
-        anchors.top: parent.top
-        anchors.topMargin: mm
-        anchors.right: parent.right
-        text: "\uf021"
-        font.pixelSize: 3*mm
-        onClicked: {
-            Service.requestProfile(root.login,root.db,root,function(nc){
-                root.newContacts=nc;
-                photoImage.source="";
-                showProfile(function(newprofile){
-                    profile=newprofile;
-                    try {profileModel.clear()} catch(e){print(e)};
-                    newprofile.profiles.sort(function(obj1, obj2) {
-                        return obj1.profile_id - obj2.profile_id;
-                    })
-                    for(var i in newprofile.profiles){var obj=newprofile.profiles[i];
-                        buildProfiletext(obj,function(profiletext){
-                            profileModel.append({"profileid":obj.profile_id,"profiletext":profiletext})
-                        })
-                    }
-                    photoImage.source="file://"+newprofile.friendica_owner.profile_image;
-                });
-            });
-        }
-    }
-
-
-    Image {
-        id: photoImage
-        anchors.top: parent.top
-        anchors.topMargin: mm
-        anchors.left: parent.left
-        width: 15*mm
-        height:15*mm
-        source: "file://"+profile.friendica_owner.profile_image
-        onStatusChanged: if (photoImage.status == Image.Error) {source="qrc:/images/defaultcontact.jpg"}
-        MouseArea{
-                anchors.fill: parent
-                onClicked:{
-                    imagePicking=true;
-                    var imagePicker = Qt.createQmlObject('import QtQuick 2.0; import "qrc:/qml/genericqml";'+
-                    osSettings.imagePickQml+'{multiple: false;onReady: {photoImage.source=imageUrl;'+
-                    '}}',profileGridTab,"imagePicker");
-                     imagePicker.pickImage()
-                }
-        }
-    }
-        Rectangle{
-            id:phototextRectangle
-            color:"black"
-            z:3
-            opacity: 0.5
-            width:6*mm
-            height: phototext.contentHeight
-            anchors.top: photoImage.top
-            anchors.right: photoImage.right
-        }
-        Text {
-            id:phototext
-            z:4
-            text: "\uf040"
-            width:5*mm
-            anchors.top: photoImage.top
-            anchors.right:photoImage.right
-            color: "white"
-            font.pixelSize: 4*mm
-        }
-
-    MButton{
-        id:updatebutton
-        height: 6*mm
-        width:8*mm
-        visible: "file://"+profile.friendica_owner.profile_image!= photoImage.source
-        text:qsTr("Update")
-        font.pixelSize: 3*mm
-        anchors.left: photoImage.right
-        anchors.leftMargin: 0.5*mm
-        anchors.topMargin: mm
-        anchors.top: parent.top
-        onClicked:{updateProfileImage()}
-     }
-     Label {
-        id: namelabel
-        x: mm
-        width: parent.width-6*mm
-        height: 3*mm
-        text:(Qt.atob(profile.friendica_owner.name))+" (@"+profile.friendica_owner.screen_name+")"
-        elide:Text.ElideRight
-        anchors.topMargin: 0
-        anchors.left: photoImage.left
-        wrapMode: Text.Wrap
-        color: "#303030"
-        font.pixelSize: 4*mm
-        anchors.top: photoImage.bottom
-        }
-
-    ListModel{id:profileModel}
-    Component{
-        id:profileItem
-        Rectangle{
-            id:profileRect
-            width:profileView.width
-            height: 5*mm+profiletextfield.height
-            Text{
-                y:mm
-                font.pixelSize: 3*mm
-                text:"<b>"+qsTr("profile id")+": </b> "+profileid+"<br>"
-                color:"black"
-            }
-            Text{
-                id:profiletextfield
-                x:2*mm
-                y:4.5*mm
-                width:parent.width-2.5*mm
-                wrapMode: Text.Wrap
-                font.pixelSize: 3*mm
-                text:profiletext
-                color:"black"
-            }
-        }
-    }
-    Component{
-        id:textcomponent
-        Text{
-            id:namelabeltext
-            width: namelabelflickable.width
-            height: implicitHeight
-            font.pixelSize: 3*mm
-            textFormat:Text.RichText
-            wrapMode: Text.Wrap
-            text:"<b>"+qsTr("Description")+": </b> "+(Qt.atob(profile.friendica_owner.description))+"<br> <b>"+qsTr("Location")+":</b> "+profile.friendica_owner.location+"<br> <b>"+qsTr("Posts")+":</b> "+profile.friendica_owner.statuses_count+
-                "<br> <b>"+qsTr("URL")+":</b> <a href='"+ profile.friendica_owner.url+"'>"+profile.friendica_owner.url+"</a><br>"+
-                "<b>"+qsTr("Created at")+":</b> "+createdAtDate.toLocaleString(Qt.locale())
-            onLinkActivated: {
-               Qt.openUrlExternally(link)}
-        }
-    }
-
-//    Rectangle{
-//       id: detailsrectangle
-
-
-       ScrollView{
-           ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
-           id:namelabelflickable
-           anchors.top: namelabel.bottom
-           anchors.topMargin: 2*mm
-           width: parent.width-mm
-           height:parent.height-22*mm//friendsTabView.height-45*mm
-           x: mm
-           clip:true
-
-           ListView {
-             id: profileView
-             header:textcomponent
-//             width:parent.width
-//             height: root.height
-//             clip: true
-             spacing: 0
-             model: profileModel
-             delegate: profileItem
-            }
-        }
-//    }
-
-    Component.onCompleted: {
-        profile.profiles.sort(function(obj1, obj2) {
-            return obj1.profile_id - obj2.profile_id;
-        })
-        for(var i in profile.profiles){var obj=profile.profiles[i];
-            buildProfiletext(obj,function(profiletext){
-                profileModel.append({"profileid":obj.profile_id,"profiletext":profiletext})
-            })
-        }
-    }
-}
diff --git a/source-android/qml/friendiqa.qml b/source-android/qml/friendiqa.qml
index c061520..b4e2e3f 100644
--- a/source-android/qml/friendiqa.qml
+++ b/source-android/qml/friendiqa.qml
@@ -31,14 +31,14 @@
 
 import QtQuick 2.5
 import QtQuick.LocalStorage 2.0
-import QtQuick.Window 2.0
+import QtQuick.Window 2.13
 import QtQuick.Controls 2.4
 import QtQuick.Layouts 1.11
 import "qrc:/js/news.js" as Newsjs
 import "qrc:/js/service.js" as Service
 
-
 StackView{
+
     id:root
     property QtObject osSettings: {var tmp=Qt.createComponent("qrc:/qml/configqml/OSSettingsAndroid.qml");return tmp.createObject(root)}
     width: osSettings.appWidth
@@ -107,7 +107,8 @@ StackView{
 
     Keys.onReleased: {
         if (event.key === osSettings.backKey) {
-            if (currentIndex==0){
+
+            if (rootstack.currentIndex==0){
                 newstab.active=true;
                 if (newstab.newstabstatus!=login.newsViewType){
                     newstab.newstabstatus=login.newsViewType;
@@ -120,13 +121,14 @@ StackView{
                     })}
                 }
                 else if (newstab.conversation.length>0){newstab.conversation=[]}
+                else if (root.depth>1){root.pop()}
                 else{Service.cleanNews(root.db,function(){
                     Service.cleanContacts(root.login,root.db,function(){
                         Qt.quit()})
                 })}
              }
-         else if (currentIndex==2){fotoSignal("backButton")}
-         else {currentIndex=0}
+         else if (rootstack.currentIndex==2){fotoSignal("backButton")}
+         else {rootstack.currentIndex=0}
          event.accepted = true
     }}
 
@@ -387,9 +389,10 @@ StackView{
             }
 
         }
-    Component.onCompleted: {
+
+        Component.onCompleted: {
+        forceActiveFocus();
         Service.readGlobaloptions(db,function(go){globaloptions=go})
-        //print(xhr.networktype());
         if(osSettings.osType=="Android"){
             var component = Qt.createComponent("qrc:/qml/genericqml/IntentReceiver.qml");
             var IntentReceiverQml = component.createObject(root);
diff --git a/source-android/qml/genericqml b/source-android/qml/genericqml
new file mode 120000
index 0000000..fb2051d
--- /dev/null
+++ b/source-android/qml/genericqml
@@ -0,0 +1 @@
+./../../source-linux/qml/genericqml/
\ No newline at end of file
diff --git a/source-android/qml/genericqml/BlueButton.qml b/source-android/qml/genericqml/BlueButton.qml
deleted file mode 100644
index 997db9b..0000000
--- a/source-android/qml/genericqml/BlueButton.qml
+++ /dev/null
@@ -1,73 +0,0 @@
-//  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.0
-Rectangle{
-    id: blueButton
-    width: Math.max(mainText.width+2*mm,8*mm)
-    height: 5*mm
-    color:"light blue"//"#EFEAEA" "sky blue"
-    property alias fontColor: mainText.color
-//    border.color:"grey"
-//    border.width:1
-    radius: mm
-    property alias text: mainText.text
-    property alias font: mainText.font
-    signal clicked
-    state:""
-
-    Text{
-        id:mainText
-        color: "black"
-        anchors.centerIn: parent
-        width: contentWidth
-        height: contentHeight
-        font.family:fontAwesome.name
-        font.pixelSize: 3*mm
-        text: ""
-        }
-    MouseArea{
-        id:buttonArea
-        anchors.fill:parent
-        onPressed: blueButton.state="Pressed"
-        onReleased: blueButton.state=""
-        onClicked: {parent.clicked()}
-        }
-
-states: [
-    State { name: "Pressed"
-       PropertyChanges { target: blueButton; color: "white"} }
-    ]
-transitions: [
-    Transition { to:"*"
-        ColorAnimation { target: blueButton; duration: 100} }
-    ]
-}
diff --git a/source-android/qml/genericqml/ImagePicker.qml b/source-android/qml/genericqml/ImagePicker.qml
deleted file mode 100644
index d414c1f..0000000
--- a/source-android/qml/genericqml/ImagePicker.qml
+++ /dev/null
@@ -1,58 +0,0 @@
-import QtQuick 2.0
-import AndroidNative 1.0
-
-Item {
-
-    /// Set it to true if multiple images should be picked.
-    property bool multiple: false
-
-    /// If it is true, it will broadcast the taked photo to other application (e.g Let it show in Google Photos)
-    property bool broadcast: true
-
-    /// The URL of the image chosen. If multiple images are picked, it will be equal to the first image.
-    property string imageUrl: ""
-
-    /// A list of images chosen
-    property var imageUrls: []
-
-    /// It is emitted whatever photo(s) are picked/taken.
-    signal ready();
-
-    function pickImage() {
-        SystemDispatcher.dispatch(m_PICK_IMAGE_MESSAGE,{ multiple: multiple});
-    }
-
-    function takePhoto() {
-        SystemDispatcher.dispatch(m_TAKE_PHOTO_MESSAGE,{
-                                      broadcast: broadcast
-                                  })
-    }
-
-    property string m_PICK_IMAGE_MESSAGE: "androidnative.ImagePicker.pickImage";
-
-    property string m_TAKE_PHOTO_MESSAGE: "androidnative.ImagePicker.takePhoto";
-
-    property string m_CHOSEN_MESSAGE: "androidnative.ImagePicker.chosen";
-
-
-    Connections {
-        target: SystemDispatcher
-        onDispatched: {
-            if ((type === m_CHOSEN_MESSAGE) && (root.imagePicking==true)) {
-                var h=[];
-                for (var n in message.imageUrls){
-                    h.push("file://"+ decodeURIComponent(message.imageUrls[n]).substring(5))
-                }
-                imageUrls=h;
-                imageUrl=h[0];
-                ready();
-                root.imagePicking=false
-            }
-        }
-    }
-
-    Component.onCompleted: {
-        SystemDispatcher.loadClass("androidnative.ImagePicker");
-    }
-}
-
diff --git a/source-android/qml/genericqml/ImagePickerLinux.qml b/source-android/qml/genericqml/ImagePickerLinux.qml
deleted file mode 100644
index cd3b182..0000000
--- a/source-android/qml/genericqml/ImagePickerLinux.qml
+++ /dev/null
@@ -1,187 +0,0 @@
-//  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.0
-import QtQuick.Controls 2.4
-import Qt.labs.folderlistmodel 2.1
-import "qrc:/js/service.js" as Service
-import "qrc:/js/helper.js" as Helperjs
-import "qrc:/qml/genericqml"
-
-Rectangle{
-    id:imageDialog
-    z:2
-    border.color: "grey"
-    width: parent.width-4*mm
-    height:parent.height-12*mm
-    x:2*mm
-    y:10*mm
-    property string directory: ""
-    property bool multiple: false
-    property string imageUrl: ""
-    property var imageUrls: []
-    signal ready();
-    function pickImage() {}
-
-    Text{
-        id:directoryText
-         x:0.5*mm
-         y:0.5*mm
-         width: imageDialog.width-15*mm
-         height:contentHeight
-         wrapMode: Text.Wrap
-         text: directory
-    }
-    Button{
-        id:closeButton
-        height: 8*mm
-        anchors.top: parent.top
-        anchors.topMargin: 0.5*mm
-        anchors.right: parent.right
-        anchors.rightMargin: 1*mm
-        text:   "\uf057"
-        onClicked:{ready();imageDialog.destroy()}
-    }
-
-    ListView {
-        id: imageView
-        x:0.5*mm
-        y: Math.max(directoryText.height, closeButton.height)+mm
-        width: imageDialog.width-2*mm
-        height: imageDialog.height-imageView.y-4*mm
-        clip: true
-        model: imageModel
-        delegate: imageItem
-    }
-
-    FolderListModel{
-        id: imageModel
-        nameFilters: ["*.png", "*.jpg",".jpeg","*.JPG","*.gif"]
-        sortField: FolderListModel.Time
-        sortReversed:false
-        showDotAndDotDot: true
-        showDirs: true
-        showDirsFirst: true
-        folder:directory
-    }
-
-    BusyIndicator{
-        id: imageBusy
-        anchors.horizontalCenter: imageView.horizontalCenter
-        anchors.top:imageView.top
-        anchors.topMargin: 2*mm
-        width:10*mm
-        height: 10*mm
-        running:false
-    }
-
-    Component{
-        id:imageItem
-        Item{
-            width:imageView.width
-            height:folderImage.height+2*mm
-            Rectangle{
-                id:imagetextRectangle
-                color:"black"
-                x:mm
-                z:3
-                opacity: fileIsDir?0:0.5
-                width:imagetext.contentWidth
-                height: imagetext.contentHeight
-                anchors.bottom: folderImage.bottom
-            }
-            Text {
-                id:imagetext
-                x:fileIsDir?11*mm:mm
-                z:4
-                text: fileName
-                width: fileIsDir?parent.width - 12*mm :imageView.width-mm
-                anchors.bottom: folderImage.bottom
-                color: fileIsDir?"black":"white"
-                font.pixelSize: 3*mm
-                wrapMode:Text.Wrap
-            }
-            Text {
-                id:selected
-                anchors.right:parent.right
-                visible: attachImageURLs.indexOf(fileURL)>-1
-                z:4
-                text: "\u2713"
-                width: 10*mm
-                anchors.top: folderImage.top
-                color: "green"
-                font.pixelSize: 10*mm
-            }
-
-            Image{id:folderImage
-                 width: fileIsDir?10*mm: imageView.width-mm
-                 fillMode:Image.PreserveAspectFit
-                 source:fileIsDir?"qrc:/images/folder-blue.png":fileURL
-                }
-
-            MouseArea{
-                anchors.fill: parent
-                onClicked:{
-                   if (fileName==".."){
-                        imageModel.folder=imageModel.parentFolder;
-                        directory=imageModel.parentFolder
-                    }
-                    else if (fileIsDir){
-                        imageModel.folder=fileURL;
-                        directory=fileURL
-                    }
-                    else{
-                        if (multiple!=true){
-                            //attachImageURLs.push(fileURL);
-                            //attachImage(fileURL);
-                            imageUrls.push(fileURL);
-                            imageUrl=fileURL;
-                            ready();
-                            imageDialog.destroy()
-                        }
-                        else {
-                            if(selected.visible==true){
-                                imageUrls.splice(imageUrls.indexOf(fileURL,1))
-                                selected.visible=false
-                            }
-                            else{
-                                imageUrls.push(fileURL);
-                                selected.visible=true;
-    
-                            }
-                            imageUrl=fileURL
-                        }
-                    }
-                }
-            }
-          }
-     }
-}
diff --git a/source-android/qml/genericqml/IntentReceiver.qml b/source-android/qml/genericqml/IntentReceiver.qml
deleted file mode 100644
index 1ceaacf..0000000
--- a/source-android/qml/genericqml/IntentReceiver.qml
+++ /dev/null
@@ -1,46 +0,0 @@
-import QtQuick 2.0
-import AndroidNative 1.0
-
-Item {
-    id:intent
-    /// The URL of the image chosen. If multiple images are picked, it will be equal to the first image.
-    property string imageUrl: ""
-
-    /// A list of images chosen
-    property var imageUrls: []
-
-    property string m_TEXT_MESSAGE: "androidnative.TextIntent.chosen";
-    property string m_IMAGE_MESSAGE: "androidnative.ImagePicker.chosen";
-
-
-    Connections {
-        target: SystemDispatcher
-        onDispatched: {
-            if ((type === m_IMAGE_MESSAGE)&& (root.imagePicking==false)) {
-                var h=[];
-                for (var n in message.imageUrls){
-                    h.push("file://"+ decodeURIComponent(message.imageUrls[n]).substring(5))
-                }
-                imageUrls=h;
-                if(imageUrls.length==1){
-                    rootstack.currentIndex=0;newstab.active=true;
-                    root.uploadSignal(imageUrls)
-                } else{
-                       rootstack.currentIndex=2;fotostab.active=true;
-                       root.uploadSignal(imageUrls)
-                }
-            } else if (type==m_TEXT_MESSAGE){  
-                rootstack.currentIndex=0;newstab.active=true;
-                root.sendtextSignal(message)
-            }
-        }
-    }
-
-    Component.onCompleted: {
-        SystemDispatcher.setInitialized();
-        if (root.globaloptions.hasOwnProperty("syncinterval") && root.globaloptions.syncinterval !=null && root.globaloptions.syncinterval !=0){
-            alarm.setAlarm(root.globaloptions.syncinterval);
-        }
-    }
-}
-
diff --git a/source-android/qml/genericqml/LinuxSync.qml b/source-android/qml/genericqml/LinuxSync.qml
deleted file mode 100644
index 0e6d84d..0000000
--- a/source-android/qml/genericqml/LinuxSync.qml
+++ /dev/null
@@ -1,22 +0,0 @@
-import QtQuick 2.4
-
-
-Item {
-    Timer{
-        id:syncTimer
-        repeat: true
-        onTriggered: {
-            updatenews.setDatabase();
-            updatenews.login();
-            updatenews.startsync();
-        }
-    }
-
-    Component.onCompleted: {
-        if (root.globaloptions.hasOwnProperty("syncinterval") && root.globaloptions.syncinterval !=null && root.globaloptions.syncinterval !=0){
-            syncTimer.interval=root.globaloptions.syncinterval*60000;
-            syncTimer.start()
-        }
-    }
-}
-
diff --git a/source-android/qml/genericqml/MButton.qml b/source-android/qml/genericqml/MButton.qml
deleted file mode 100644
index 08932ae..0000000
--- a/source-android/qml/genericqml/MButton.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-//  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick.Controls 2.4
-Button{
-    id: mButton
-    width: Math.max(text.width+2*mm,8*mm)
-    height: 6*mm
-    //color: Material.grey
-    font.pixelSize: 3*mm
-}
diff --git a/source-android/qml/genericqml/PermissionDialog.qml b/source-android/qml/genericqml/PermissionDialog.qml
deleted file mode 100644
index 8faaad8..0000000
--- a/source-android/qml/genericqml/PermissionDialog.qml
+++ /dev/null
@@ -1,220 +0,0 @@
-//  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.11
-import "qrc:/js/service.js" as Service
-import "qrc:/js/helper.js" as Helperjs
-import "qrc:/qml/genericqml"
-
-Rectangle{
-    id:permissionDialog
-//    x: mm
-    width: parent.width-5*mm
-    height:root.height/3
-    function updatePerms(){
-        for (var i=0;i<groupModel.count;i++)
-        {if (groupModel.get(i).groupstatus=="positive"){
-             group_allow.push(groupModel.get(i).group.gid)
-             }
-         if (groupModel.get(i).groupstatus=="negative"){
-             group_deny.push(groupModel.get(i).group.gid)
-             }
-         }
-        for (var j=0;j<contactModel.count;j++){
-         if (contactModel.get(j).contactstatus=="positive"){
-             contact_allow.push(contactModel.get(j).contact.cid)
-             }
-         if (contactModel.get(j).contactstatus=="negative"){
-             contact_deny.push(contactModel.get(j).contact.cid)
-             }
-             if ((contact_allow.length==0)&&(contact_deny.length==0)&&(group_allow.length==0)&&(group_deny.length==0))
-             {permButton.text="\uf09c"}
-             else{permButton.text="\uf023"}
-         }}
-
-    Text{
-         x:0.5*mm
-         y:0.5*mm
-         text: qsTr("Friends")
-    }
-    ListView {
-          id: contactView
-          x:0.5*mm
-          y:5.5*mm
-          width: permissionDialog.width/2-2*mm
-          height: permissionDialog.height-14*mm
-          clip: true
-          spacing: 1
-          model: contactModel
-          delegate: contactItem
-     }
-
-     ListModel{id: contactModel}
-     Component{
-         id:contactItem
-         Rectangle{
-             id:contactitemRect
-             width:contactView.width
-             height: 5*mm
-             radius: 0.5*mm
-             property string contactstatus
-             onContactstatusChanged:{
-                 if(contactstatus=="positive"){contactitemRect.color="light green"}
-                   else if (contactstatus=="negative"){contactitemRect.color= "ffe6e6"}
-                   else{contactitemRect.color= "white"}}
-             color: "white"
-             border.color:"grey"
-             Text{
-               color:"grey"
-               text:contact.screen_name
-               }
-            MouseArea{
-                anchors.fill: parent
-                onClicked:{
-                    if(contactModel.get(index).contactstatus=="neutral"){
-                        contactModel.set(index,{"contactstatus":"positive"});
-                        contactstatus="positive"
-                    }
-                    else if (contactModel.get(index).contactstatus=="positive"){
-                        contactModel.set(index,{"contactstatus":"negative"})
-                        contactstatus="negative"
-                    }
-                    else{contactModel.set(index,{"contactstatus":"neutral"});
-                        contactstatus="neutral";
-                    }
-             }}
-          Component.onCompleted:{
-                    if (contactModel.get(index).contactstatus=="positive"){
-                  contactstatus="positive"
-              }
-              else if (contactModel.get(index).contactstatus=="negative"){
-                  contactstatus="negative"
-              }
-               else {contactstatus="neutral"}  }
-          }
-      }
-     Text{
-         x:contactView.width+2*mm
-         y:0.5*mm
-         text: qsTr("Groups")
-    }
-    ListView {
-          id: groupView
-          x:contactView.width+2*mm
-          y:5.5*mm
-          width: permissionDialog.width/2-2*mm
-          height: permissionDialog.height-14*mm
-          clip: true
-          spacing: 1
-          model: groupModel
-          delegate: groupItem
-     }
-
-     ListModel{id: groupModel}
-     Component{
-          id:groupItem
-          Rectangle{
-             id:groupitemRect
-             width:groupView.width
-             radius: 0.5*mm
-             height: 5*mm
-             property string groupstatus:"neutral"
-             onGroupstatusChanged:
-                {if(groupstatus=="positive"){groupitemRect.color="light green"}
-                 else if (groupstatus=="negative"){groupitemRect.color= "#ffe6e6"}
-                 else{groupitemRect.color= "white"}}
-             color: "white"
-             border.color:"grey"
-              Text{
-                  color:"grey"
-                  text:group.groupname
-                   }
-               MouseArea{
-                anchors.fill: parent
-                onClicked:{
-                    if(groupModel.get(index).groupstatus=="neutral"){
-                        groupModel.set(index,{"groupstatus":"positive"});
-                        groupstatus="positive"}
-                    else if (groupModel.get(index).groupstatus=="positive"){
-                        groupModel.set(index,{"groupstatus":"negative"});
-                        groupstatus="negative"}
-                   else{groupModel.set(index,{"groupstatus":"neutral"})
-                    groupstatus="neutral"}
-                }}
-             Component.onCompleted:{ if (groupModel.get(index).groupstatus=="positive"){
-                  groupstatus="positive"
-              }
-              else if (groupModel.get(index).groupstatus=="negative"){
-                  groupstatus="negative"
-              }
-               else {groupstatus="neutral"}  }
-              }
-      }
-      MButton{
-         x:0.5*mm
-         anchors.bottom: parent.bottom
-         anchors.bottomMargin:1
-         text:"\uf0c7"
-         onClicked:{
-            updatePerms();
-            var perms=[];
-            perms.push(contact_allow,contact_deny,group_allow,group_deny);
-            Service.savePermissions(db,perms)
-                   }
-      }
-      MButton{
-         x:contactView.width+2*mm
-         anchors.bottom: parent.bottom
-         anchors.bottomMargin:1
-         text:"\u2713"
-         onClicked:{updatePerms();
-                    permissionDialog.visible=false;
-                    }
-        }
-
-     Component.onCompleted:{
-         Helperjs.readData(db,"contacts",login.username,function(contacts){
-            for (var name in contacts){
-               var contactstatus="neutral";
-               if (contact_allow.indexOf(contacts[name].cid)>-1){contactstatus="positive"}
-               else if (contact_deny.indexOf(contacts[name].cid)>-1){contactstatus="negative"}
-               contactModel.append({"contact":contacts[name],"contactstatus":contactstatus})
-         }},"isFriend",1);
-
-         Helperjs.readData(db,"groups",login.username,function(owngroups){
-            for (var number in owngroups){
-                  var groupstatus= "neutral";
-                  if (group_allow.indexOf(owngroups[number].gid)>-1){groupstatus="positive"}
-                  else if (group_deny.indexOf(owngroups[number].gid)>-1){groupstatus="negative"}
-                   groupModel.append({"group":owngroups[number],"groupstatus":groupstatus})
-         }});
-      }
-}
diff --git a/source-android/qml/genericqml/Search.qml b/source-android/qml/genericqml/Search.qml
deleted file mode 100644
index 835e7be..0000000
--- a/source-android/qml/genericqml/Search.qml
+++ /dev/null
@@ -1,87 +0,0 @@
-//  This file is part of Friendiqa
-//  https://github.com/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.7
-import QtQuick.Controls 1.2
-import "qrc:/qml/genericqml"
-//import "qrc:/js/news.js" as Newsjs
-//import "qrc:/js/helper.js" as Helperjs
-//import "qrc:/js/service.js" as Service
-
-
-Rectangle {
-    id:searchComponent
-    //onActiveFocusChanged: searchText.forceActiveFocus()
-    //onVisibleChanged: if (visible) searchText.forceActiveFocus()
-//    border.color: "#EEEEEE"
-//           border.width: 1
-           color:"lightgrey"
-//           width:conversationView.width
-//           height:Math.max(replyText.contentHeight+2*mm,6*mm)
-    Rectangle{
-        color: "white"
-        radius:0.5*mm
-        anchors.left: parent.left
-        anchors.leftMargin:mm
-        anchors.top:parent.top
-        anchors.topMargin: 0.5*mm
-        width:parent.width-2*mm
-        height: 4*mm //Math.max( searchText.contentHeight,5*mm)
-
-        TextInput {
-            id: searchText
-            focus: true
-            font.pixelSize: 3*mm
-            wrapMode: Text.Wrap
-            anchors.fill: parent
-            selectByMouse: true
-            cursorVisible: false
-            onEditingFinished:{ if (displayText!=""){search(displayText)};searchComponent.destroy()}
-            //onHeightChanged: newsView.contentY+=4.5*mm
-
-        }
-        Component.onCompleted: searchText.forceActiveFocus()
-//        BlueButton {
-//            id: sendButton
-//            text: "\uf002"
-//            anchors.left: parent.right
-//            anchors.leftMargin:mm
-//            anchors.top:parent.top
-//            //anchors.topMargin: 0.5*mm
-//            color:"white"
-//            onClicked: {
-//                var body=searchText.getText(0,searchText.length);
-//                search(body)
-//            }
-//        }
-    }
-
-}
diff --git a/source-android/qml/newsqml b/source-android/qml/newsqml
new file mode 120000
index 0000000..892373b
--- /dev/null
+++ b/source-android/qml/newsqml
@@ -0,0 +1 @@
+./../../source-linux/qml/newsqml/
\ No newline at end of file
diff --git a/source-android/qml/newsqml/ContactPage.qml b/source-android/qml/newsqml/ContactPage.qml
deleted file mode 100644
index e3c7ead..0000000
--- a/source-android/qml/newsqml/ContactPage.qml
+++ /dev/null
@@ -1,217 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.0
-import QtQuick.Controls 2.4
-import "qrc:/js/helper.js" as Helperjs
-import "qrc:/qml/genericqml"
-
-Rectangle {
-    id:contactList
-    color: "white"
-    property var contact:({})
-    property string profileimagesource:contact.profile_image
-   ListView {
-          id: contactView
-          x:mm
-          y:9*mm
-          width: contactList.width-4*mm
-          height:contactList.height-10*mm
-          clip: true
-          spacing: 0
-          header: contactHeader
-          model: contactModel
-          delegate: Newsitem{}
-          }
-    BusyIndicator{
-         id: contactBusy
-         anchors.centerIn:parent
-         width:10*mm
-         height: 10*mm
-         running: true
-       }
-
-   Component {  id: contactHeader
-       Rectangle{
-           border.color: "#EEEEEE"
-           border.width: 1
-           color:"white"
-           width:contactView.width
-           height: profileImage.height+namelabel.height+detailtext.height+7*mm
-           //height: wrapper.height
-           property var createdAtDate: new Date(contact.created_at)
-           property string connectUrl: (contact.network!=="dfrn")||(contact.isFriend!=0)?"":( "<a href='"+contact.url.replace("profile","dfrn_request") +"'>"+qsTr("Connect")+"</a><br>")
-
-               Image {
-                   id: profileImage
-                   x:mm
-                   y:mm
-                   width: contactView.width/2
-                   height:width
-                   source:(contact.profile_image!="")? "file://"+contact.profile_image : contact.profile_image_url
-                   onStatusChanged: if (profileImage.status == Image.Error) {source="qrc:/images/defaultcontact.jpg"}
-                   Connections{
-                       target:contactList
-                       onProfileimagesourceChanged:profileImage.source=profileimagesource
-                   }
-               }
-               Column{id:buttoncolumn
-                   anchors.right: parent.right
-                   anchors.rightMargin: mm
-                   y: mm
-                      spacing:4
-
-                      MButton{
-                          id:photobutton
-                          height: 6*mm
-                          width: 8*mm
-                          text: "\uf03e" // "Photos"
-                          //font.pixelSize: 3*mm
-                          visible:(contact.network=="dfrn")
-                          onClicked:{
-                              rootstack.currentIndex=2;
-                              bar.currentIndex=2;
-                              fotostab.phototabstatus="Contact";
-
-                              //fotostab.active=true;
-                              fotoSignal(root.login,contact) ;
-                              newsStack.pop();
-                              }
-                       }
-
-                      MButton{
-                          id:dmbutton
-                          height: 6*mm
-                          width: 8*mm
-                          visible: (contact.following=="true")
-                          text: "\uf040" //"DM"
-                          //font.pixelSize: 3*mm
-                          onClicked:{
-                              rootstack.currentIndex=0;
-                              newsSwipeview.currentIndex=2;
-                              directmessageSignal(contact)
-                          }
-                      }
-
-                      MButton{
-                          id:eventbutton
-                          visible:(contact.network=="dfrn")
-                          height: 6*mm
-                          width: 8*mm
-                          text:"\uf073"
-                          //font.pixelSize: 3*mm
-                          onClicked:{
-                              rootstack.currentIndex=3;
-                              bar.currentIndex=3;
-                              calendartab.calendartabstatus="Friend"
-                              eventSignal(contact);
-                              newsStack.pop()
-                          }
-                      }
-
-                  }//Column end
-               Label {
-                   id: namelabel
-                   x:mm
-                   width: contactView.width-2*mm
-                   height: implicitHeight
-                   text:contact.name+" (@"+contact.screen_name+")"
-                   wrapMode: Text.Wrap//elide:Text.ElideRight
-                   color: "#303030"
-                   font.pixelSize: 4*mm
-                   anchors.top: profileImage.bottom
-                   anchors.topMargin: mm
-               }
-              Text{
-                  id:detailtext
-                  anchors.top: namelabel.bottom
-                  anchors.topMargin: 2*mm
-                  x:mm
-                  width: contactView.width-2*mm
-                  height: implicitHeight
-                  font.pixelSize: 2.5*mm
-                  textFormat:Text.RichText
-                  wrapMode: Text.Wrap
-                  text:"<b>"+qsTr("Description")+": </b> "+contact.description+"<br> <b>"+qsTr("Location")+":</b> "+contact.location+"<br> <b>"+qsTr("Posts")+":</b> "+contact.statuses_count+
-                          "<br> <b>"+qsTr("URL")+":</b> <a href='"+ contact.url+"'>"+contact.url+"</a><br>"+
-                          connectUrl+ "<b>"+qsTr("Created at")+":</b> "+createdAtDate.toLocaleString(Qt.locale())
-                  onLinkActivated: {
-                    Qt.openUrlExternally(link)}
-               }
-
-
-               //}
-           }
-
-       }//Component end
-    Connections{
-        target:newstab
-        onContactpostsChanged:{
-            if (newstab.contactposts.length>0){profileimagesource=newstab.contactposts[0].user.profile_image_url_large}
-            contactBusy.running=false;
-            contactModel.clear();
-            var currentTime= new Date();
-            var msg = {'currentTime': currentTime, 'model': contactModel,'news':newstab.contactposts, 'options':globaloptions};
-            contactWorker.sendMessage(msg)
-        }
-    }
-
-    ListModel{id: contactModel}
-
-    WorkerScript {
-        id: contactWorker
-        source: "qrc:/js/newsworker.js"
-    }
-
-    MButton {
-            id: closeButton
-            height: 6*mm
-            width: 8*mm
-            anchors.top: parent.top
-            anchors.topMargin: 1*mm
-            anchors.right: parent.right
-            anchors.rightMargin: 1*mm
-            text: "\uf057"
-            //font.pixelSize: 3*mm
-            onClicked: {
-                newsStack.pop()
-            }
-    }
-    Component.onCompleted: {
-                    xhr.clearParams();
-                    xhr.setLogin(login.username+":"+Qt.atob(login.password));
-                    xhr.setUrl(login.server);
-                    xhr.setApi("/api/statuses/user_timeline");
-                    xhr.setParam("user_id",contact.id)
-                    xhr.get();
-    }
-}
diff --git a/source-android/qml/newsqml/Conversation.qml b/source-android/qml/newsqml/Conversation.qml
deleted file mode 100644
index c3fc24a..0000000
--- a/source-android/qml/newsqml/Conversation.qml
+++ /dev/null
@@ -1,189 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-// ConversationView with button
-import QtQuick 2.0
-import QtQuick.Controls 2.4
-import "qrc:/js/helper.js" as Helperjs
-import "qrc:/qml/genericqml"
-import "qrc:/qml/newsqml"
-
-Rectangle {
-    id:conversationList
-//    width:root.width-5*mm
-//    height:root.height-12*mm
-    //property var news
-//    y:1
-//    z:2
-    color: "white"
-//    border.color: "grey"
-//    width:root.width-5*mm
-//    height: conversationView.height+10*mm
-
-   ListView {
-          id: conversationView
-          x:3*mm
-          y:8*mm
-          width: conversationList.width-4*mm
-          //height: contentHeight
-          height:conversationList.height-10*mm
-          clip: true
-          spacing: 0
-          footer: MessageSend{conversation:true}//footerReply
-          model: conversationModel
-          delegate: Newsitem{}
-          }
-    BusyIndicator{
-         id: conversationBusy
-         anchors.horizontalCenter: conversationView.horizontalCenter
-         anchors.top:conversationList.top
-         anchors.topMargin: 2*mm
-         width:10*mm
-         height: 10*mm
-         running: true
-       }
-
-    Connections{
-        target:newstab
-        onConversationChanged:{
-            //if(newsitem.itemindex==newsStack.conversationIndex){
-                if(newstab.conversation.length==0){
-                    newsStack.pop()
-                    //newsView.positionViewAtIndex(newsStack.conversationIndex,ListView.Beginning);
-                    //conversationList.destroy(); conversationsymbol.color="grey"
-                } else { conversationBusy.running=false;
-                  conversationModel.clear();
-                  var currentTime= new Date();
-                  var msg = {'currentTime': currentTime, 'model': conversationModel,'news':newstab.conversation, 'options':globaloptions};
-                  conversationWorker.sendMessage(msg)
-                  //conversationsymbol.color="grey"
-                }
-            //}
-        }
-    }
-
-//   Component {  id:footerReply
-//       Rectangle{
-//           border.color: "#EEEEEE"
-//           border.width: 1
-//           color:"lightgrey"
-//           width:conversationView.width
-//           height:Math.max(replyText.contentHeight+2*mm,6*mm)
-//           Rectangle{
-//               color: "white"
-//               radius:0.5*mm
-//               anchors.left: parent.left
-//               anchors.leftMargin:mm
-//               anchors.top:parent.top
-//               anchors.topMargin: 0.5*mm
-//               width:parent.width-12*mm
-//               height:Math.max( replyText.contentHeight,5*mm)
-
-//               TextInput {
-//                id: replyText
-//                font.pixelSize: 3*mm
-//                wrapMode: Text.Wrap
-//                anchors.fill: parent
-//                selectByMouse: true
-//                onHeightChanged: conversationView.contentY+=4.5*mm
-//                }
-//           }
-
-//           Button {
-//                id: sendButton
-//                height: 8*mm
-//                width:8*mm
-//                text: "\uf1d9"
-//                anchors.right: parent.right
-//                anchors.rightMargin:mm
-//                anchors.top:parent.top
-//                anchors.topMargin: 0.5*mm
-//                //color:"white"
-//                onClicked: { try{
-//                   var body=replyText.getText(0,replyText.length);
-//                   newsBusy.running=true;
-//                        replyText.text=""
-//                   xhr.clearParams();
-//                   xhr.setLogin(login.username+":"+Qt.atob(login.password));
-//                   if (conversationModel.get(0).newsitemobject.messagetype==0){
-
-//                       //xhr.url= login.server + "/api/statuses/update.json";
-//                  xhr.setUrl(login.server);
-//                 xhr.setApi("/api/statuses/update");
-//                       xhr.setParam("source", "Friendiqa");
-//                       xhr.setParam("status", body);
-//                       xhr.setParam("in_reply_to_status_id", conversationModel.get(conversationModel.count-1).newsitemobject.id)}
-//                   else {//xhr.url= login.server + "/api/direct_messages/new.json";
-//                       xhr.setUrl(login.server);
-//                      xhr.setApi("/api/direct_messages/new");
-//                       xhr.setParam("text", body);
-//                       xhr.setParam("screen_name",conversationModel.get(conversationModel.count-1).newsitemobject.screen_name);
-//                       xhr.setParam("replyto", conversationModel.get(conversationModel.count-1).newsitemobject.id)
-//                   }
-//                   xhr.post();
-//                   } catch(e){Helperjs.showMessage("Error",e.toString(),root)}
-//               }
-//           }
-//       }
-//   }
-
-
-
-    ListModel{id: conversationModel}
-
-    WorkerScript {
-        id: conversationWorker
-        source: "qrc:/js/newsworker.js"
-    }
-
-    MButton {
-            id: closeButton
-            height: 6*mm
-            width: 8*mm
-            anchors.top: parent.top
-            anchors.topMargin: 1*mm
-            anchors.right: parent.right
-            anchors.rightMargin: 1*mm
-            text: "\uf057"
-            onClicked: {
-                //newsView.positionViewAtIndex(newsStack.conversationIndex,ListView.Beginning);
-                newsStack.pop()
-                //conversationList.destroy();
-                //conversationsymbol.color="grey"
-            }
-    }
-
-//    Component.onCompleted: {
-//        if (news){var currentTime= new Date();
-//        var msg = {'currentTime': currentTime, 'model': conversationModel,'news':news};
-//        conversationWorker.sendMessage(msg)}
-//    }
-}
diff --git a/source-android/qml/newsqml/FriendicaActivities.qml b/source-android/qml/newsqml/FriendicaActivities.qml
deleted file mode 100644
index 38ffe3b..0000000
--- a/source-android/qml/newsqml/FriendicaActivities.qml
+++ /dev/null
@@ -1,108 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-// List of people from Friendica Activities
-import QtQuick 2.0
-import "qrc:/js/helper.js" as Helperjs
-import "qrc:/qml/genericqml"
-
-Rectangle {
-    id:activitiesRectangle
-    property var activitymembers
-    color: "white"
-    border.color: "light grey"
-    radius:0.5*mm
-    width:root.width/2
-    height:Math.min(root.height/2,(10*mm+6*activitymembers.length*mm))
-
-    ListView {
-          id: contactView
-          x:mm
-          y:8*mm
-          width: activitiesRectangle.width-2*mm
-          height: activitiesRectangle.height-10*mm
-          clip: true
-          spacing: 0
-          model: activitiesModel
-          delegate: activitiesContact
-          }
-
-       ListModel{id: activitiesModel}
-
-       Component {  id:activitiesContact
-               Rectangle{
-                  border.color: "#EEEEEE"
-                  border.width: 1
-                  radius:0.5*mm
-                  width:parent.width
-                  height:6*mm
-                  Image {
-                      id: contactImage
-                      x:1
-                      y:1
-                      width: 5*mm
-                      height:5*mm
-                      source:(contact.profile_image!="")? "file://"+contact.profile_image : contact.profile_image_url
-                      onStatusChanged: if (contactImage.status == Image.Error) {source="qrc:/images/defaultcontact.jpg"}
-                      }
-                  Text{
-                    font.pixelSize: 3*mm
-                    anchors.left: contactImage.right
-                    anchors.margins: 1*mm
-                    text:contact.name
-                  }
-
-           MouseArea{
-                anchors.fill: parent
-                onClicked:{showContact(contact)}
-            }
-           }}
-
-    BlueButton {
-            id: closeButton
-            //width:10*mm
-            anchors.top: parent.top
-            anchors.topMargin: 1*mm
-            anchors.right: parent.right
-            anchors.rightMargin: 1*mm
-            color:"white"
-            text: "\uf057"//  qsTr("Close")
-            onClicked: {
-                activitiesRectangle.destroy()
-            }
-    }
-
-    Component.onCompleted: {
-        for (var user in activitymembers){
-            activitiesModel.append({"contact":activitymembers[user]})
-        }
-    }
-}
diff --git a/source-android/qml/newsqml/Hashtag.qml b/source-android/qml/newsqml/Hashtag.qml
deleted file mode 100644
index 2b1cf68..0000000
--- a/source-android/qml/newsqml/Hashtag.qml
+++ /dev/null
@@ -1,51 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.0
-
-Rectangle {
-    id:hasgtagRectangle
-    color: "light grey"
-    property alias text: hashtagText.text
-    radius:0.3*mm
-    width:hashtagText.contentWidth+mm
-    height:2.5* mm
-    Text{
-        id:hashtagText
-        font.pixelSize: 1.5*mm
-        anchors.centerIn: parent
-        anchors.margins: 0.5*mm
-     }
-     MouseArea{
-        anchors.fill: parent
-        onClicked:{search(hashtagText.text.replace("#",""))}
-     }
-}
diff --git a/source-android/qml/newsqml/MessageSend.qml b/source-android/qml/newsqml/MessageSend.qml
deleted file mode 100644
index 37b46a9..0000000
--- a/source-android/qml/newsqml/MessageSend.qml
+++ /dev/null
@@ -1,427 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-// message.qml
-// message with buttons
-import QtQuick 2.4
-import QtQuick.Controls 2.4
-//import QtQuick.Dialogs 1.2
-import "qrc:/js/helper.js" as Helperjs
-import "qrc:/js/smiley.js" as Smileyjs
-import "qrc:/js/news.js" as Newsjs
-import "qrc:/qml/genericqml"
-
-
-Rectangle{
-    color:"#EEEEEE"
-    width:parent.width
-    height: (newsSwipeview.stacktype!="Notifications")?messageColumn.height+mm:0
-    id:messageSend
-    visible:(newsSwipeview.stacktype!="Notifications")?true:false
-    property string parentId: ""
-    //property var parentObject:({})
-    property bool conversation: false
-    property string reply_to_user:""
-    property alias bodyMessage: bodyField.text
-    property var attachImageURLs: [];
-    //property int directmessage: 0;
-    property var contacts: []
-    property var groups: []
-    property var contact_allow:login.permissions[0]
-    property var contact_deny:login.permissions[1]
-    property var group_allow:login.permissions[2]
-    property var group_deny:login.permissions[3]
-
-    onReply_to_userChanged: {
-        if (reply_to_user!=""){
-            receiverLabel.visible=true
-         }
-    }
-
-    function directmessagePrepare(friend){
-        messageSend.state="active";
-        reply_to_user=friend.screen_name;
-        receiverLabel.text=qsTr("to:")+ " "+ friend.screen_name;
-    }
-
-
-    function sendUrls(urls){
-        if((urls.length==1 && attachImageURLs.length==0)){
-            attachImage(urls);
-            attachImageURLs.push(urls);
-            messageSend.state="active";
-        }
-    }
-
-    function sendtext(text){
-        if(text){
-            if (text.subject=="undefined"){text.subject=""}
-            if(text.plaintext.lastIndexOf(".jpg")>-1 || text.plaintext.lastIndexOf(".jpeg")>-1 || text.plaintext.lastIndexOf(".png")>-1 || text.plaintext.lastIndexOf(".gif")>-1){
-                text.plaintext="<a href="+text.plaintext+"><img src="+text.plaintext+"></a>"}
-            bodyField.text=text.subject+"\n"+text.plaintext;
-            messageSend.state="active";
-        }
-    }
-
-
-
-    function attachImage(url){
-        var imageAttachmentObject=Qt.createQmlObject('import QtQuick 2.0; Image {id:imageAttachment'+attachImageURLs.length+'; source:"'+
-        url.toString()+'"; x:2*mm; width: 45*mm; height: 45*mm;fillMode: Image.PreserveAspectFit;MouseArea{anchors.fill:parent;onClicked:{attachImageURLs.splice(attachImageURLs.indexOf("'+
-        url+'"),1); imageAttachment'+attachImageURLs.length+'.destroy()}}}',messageColumn,"attachedImage");
-    }
-
-    function statusUpdate(title,status,in_reply_to_status_id,attachImageURL) {
-        //xhr.url= login.server + "/api/statuses/update.json";
-        newsBusy.running=true;
-        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.post();
-        }
-
-    function dmUpdate(title,text,replyto,screen_name,attachImageURL) {
-        newsBusy.running=true;
-        //xhr.url= login.server + "/api/direct_messages/new.json";
-        xhr.setLogin(login.username+":"+Qt.atob(login.password));
-        xhr.setUrl(login.server);
-        xhr.setApi("/api/direct_messages/new");
-        xhr.clearParams();
-        xhr.setParam("text", text);
-        xhr.setParam("screen_name", screen_name);
-        if (parentId!="") {xhr.setParam("replyto", replyto)};
-        //if (title!=="") {xhr.setParam("title", title)};
-        xhr.post();
-        }
-
-    function setParent(newsitemobject){
-        //print("Newsobject "+newsitemobject.id+ "  "+JSON.stringify(newsitemobject.user));
-        if (newsitemobject!=""){
-            messageSend.state="conversation"
-            reply_to_user=newsitemobject.user.screen_name;
-            receiverLabel.text=qsTr("to:")+ " "+ newsitemobject.user.screen_name;
-            parentId=newsitemobject.id
-        } else {
-            messageSend.state=""
-            reply_to_user="";
-            receiverLabel.text=qsTr("to:");
-            parentId="";
-            bodyField.text="";
-            attachImageURLs.pop();
-            try{imageAttachment.destroy()}catch(e){}
-        }
-    }
-
-    function contactmenu(letter){
-        Newsjs.listFriends(login,db,function(contacts){
-            var contactitems="";
-            for (var i=0;i<contacts.length;i++){
-                if(Helperjs.getCount(db,login,"contacts","screen_name",contacts[i].screen_name)>1){
-                    contacts[i].screen_name=contacts[i].screen_name+"+"+contacts[i].cid
-                }
-                contactitems=contactitems+"MenuItem{text:'"+contacts[i].screen_name+
-                    "'; onTriggered:{if (newsSwipeview.stacktype=='DirectMessages'){reply_to_user='"+
-                    contacts[i].screen_name+"'} else {bodyField.insert("+
-                    bodyField.cursorPosition+",' "+contacts[i].screen_name.substring(1)+" ');bodyField.cursorPosition=bodyField.cursorPosition+"+contacts[i].screen_name.length+"}}}"
-            //}
-            }
-            var menuString="import QtQuick.Controls 2.4; Menu {width:40*mm; font.pixelSize: 3*mm; "+contactitems+"}";
-            var contactlistObject=Qt.createQmlObject(menuString,messageColumn,"contactmenuOutput");
-            if (contacts.length>0){contactlistObject.popup()}
-            },letter);
-    }
-//    Flickable{
-//        anchors.fill: parent
-//        contentHeight: messageColumn.height
-//        boundsBehavior: Flickable.StopAtBounds
-
-        Column {
-            y:0.5*mm
-            id:messageColumn
-            spacing: 0.5*mm
-            width: parent.width
-            height: 10*mm//implicitHeight
-            Label{
-                id:receiverLabel
-                x: 0.5*mm
-                width: parent.width-mm
-                font.pixelSize: 3*mm
-                text: newsSwipeview.stacktype=="DirectMessages"?qsTr("to:")+ " "+ reply_to_user:""
-                visible:false// ((parentId !== "") || (newsStack.parent.stacktype=="DirectMessages"))
-                MouseArea{
-                    anchors.fill: parent
-                    onClicked:{}
-                }
-            }
-            TextField {
-                 id: titleField
-                 x: 0.5*mm
-                 width: parent.width-mm
-                 font.pixelSize: 3*mm
-                 placeholderText: qsTr("Title (optional)")
-                 visible: false//(parentId === "") && (bodyField.length>1)
-                 onVisibleChanged: if ((visible==true)&&(conversation==true)){
-                    conversationView.contentY=conversationView.contentY+titleField.height
-                 }
-              }
-
-
-
-           Rectangle{
-               color: "white"
-               radius: 0.5*mm
-               x:mm
-               width: parent.width-2*mm
-               height:Math.max(bodyField.contentHeight+4*mm,10*mm)
-               TextArea {
-                    id: bodyField
-                    anchors.fill: parent
-                    font.pixelSize: 3*mm
-                    font.family: "Noto Sans"
-                    wrapMode: Text.Wrap
-                    selectByMouse: true
-                    placeholderText: conversation?"": qsTr("What's on your mind?")
-                    textFormat: TextEdit.RichText //TextEdit.PlainText
-                    onLineCountChanged: (conversation==true)?conversationView.contentY=conversationView.contentY+3*mm:newsView.contentY=newsView.contentY+3*mm
-                    onLinkActivated:{Qt.openUrlExternally(link)}
-                    onActiveFocusChanged:{
-                        if (activeFocus==true){
-                            if (conversation==true){
-                                setParent(conversationModel.get(0).newsitemobject);
-                                messageSend.state="conversation"
-                            } else{
-                                messageSend.state="active"
-                            }
-                        }
-                    }
-                    onTextChanged:{
-                        if (text!=""){
-                        //print(getText(bodyField.cursorPosition-2,bodyField.cursorPosition) +" preedit: "+ preeditText+cursorPosition);
-                        var regex1 = /@[a-z]/;var regex2 = /![a-z]/;
-                        //print(text.substring(cursorPosition-2,cursorPosition));
-                        //if (regex.test(getText(bodyField.cursorPosition-2,bodyField.cursorPosition)) || regex.test(preeditText) || regex.test(text)){
-                        if (regex1.test(getText(bodyField.cursorPosition-2,bodyField.cursorPosition)+preeditText) || regex2.test(getText(bodyField.cursorPosition-2,bodyField.cursorPosition)+preeditText)){
-                            var letter=(getText(bodyField.cursorPosition-2,bodyField.cursorPosition)).match(/[a-z]/);
-                            contactmenu(letter)
-                        }
-                    }}
-              }
-            }
-
-
-//            Row{
-//                spacing: 2
-//                width: parent.width
-//                CheckBox{
-//                  id:dmCheckbox
-//                  text:"DM"
-//                  enabled: false
-//                  checked: (directmessage==1)?true:false
-//                  onClicked:{
-//                        if(dmCheckbox.checkedState==Qt.Checked){directmessage=1}
-//                        else if(dmCheckbox.checkedState==Qt.Unchecked){directmessage=0}
-//                         }
-//                  }
-
-//             Button{
-//                  text:"\uf0c1"
-//                  height:8*mm
-//                  onClicked: {
-//                      if(bodyField.selectedText==""){Helperjs.showMessage("Error","No text selected",messageSend)}
-//                      else{urlTextEdit.text="";
-//                      urlRectangle.visible=true}}
-//              }
-//            }
-//            Rectangle{
-//                id:urlRectangle
-//                height: 7*mm //parent.height
-//                width:parent.width-2*mm
-//                visible:false
-//                    TextField{
-//                    id:urlTextEdit
-//                    width:parent.width-7*mm
-//                    height:parent.height
-//                    }
-//                    Button{
-//                        anchors.left:urlTextEdit.right
-//                        anchors.leftMargin:mm
-//                        height:8*mm
-//                        text:"\u2713"
-//                        onClicked: {if(urlTextEdit.text!=""){
-//                           var start = bodyField.selectionStart;
-//                            var text=bodyField.selectedText
-//                            if(text.lastIndexOf(".jpg")>-1 || text.lastIndexOf(".jpeg")>-1 || text.lastIndexOf(".png")>-1){text="<img src="+text+">"}
-//                            text = "[url="+urlTextEdit.text+"]" + text + "[/url]";
-//                            bodyField.remove(start,bodyField.selectionEnd);
-//                            bodyField.insert(start,text);}
-//                            urlRectangle.visible=false}
-//                        }
-//                    }
-          Row{
-              id:buttonRow
-              visible:false //(bodyField.length>1)||(attachImageURLs.length>0)
-              spacing: mm
-              height: 12*mm
-              MButton{id:permButton
-                  visible: (newsSwipeview.stacktype!=="DirectMessages")
-                  height: 6*mm
-                  width: 7*mm
-                  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: 6*mm
-                  width: 7*mm
-                  text: "\uf03e"
-                  visible:(newsSwipeview.stacktype!="DirectMessages")
-                  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: 6*mm
-                   width: 7*mm
-                   onClicked: {if (smileyDialog.visible==false){smileyDialog.visible=true} else{smileyDialog.visible=false}}
-               }
-
-               MButton {
-                   id: cancelButton
-                   height: 6*mm
-                   width: 7*mm
-                   text: "\uf057"
-                   onClicked: {
-                       bodyField.text="";
-                       messageSend.state="";
-                       permissionDialog.visible=false;
-                       receiverLabel.visible=false;
-                       reply_to_user="";
-                       attachImage("");
-                       attachImageURLs.pop();
-                   }
-               }
-               MButton {
-                   id: sendButton
-                   height: 6*mm
-                   width: 7*mm
-                   text: "\uf1d9"
-                   onClicked: {
-                       var title=titleField.text.replace("\"","\'");
-                       var body=bodyField.getFormattedText(0,bodyField.length);
-                       var dmbody=bodyField.getText(0,bodyField.length);
-                       if (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=login.newsViewType; newsStack.pop(null)
-                        }
-                    }
-               }
-          }
-          PermissionDialog{id:permissionDialog;x:mm;visible: false}
-          SmileyDialog{id:smileyDialog;x:mm;visible: false}
-    }
-        Component.onCompleted:{
-            //
-            //parentId=conversationModel.get(conversationModel.count-1).newsitemobject.id
-            //if(attachImageURLs.length>0){attachImage(attachImageURLs[0])}
-            newsStack.replySignal.connect(setParent);
-            root.directmessageSignal.connect(directmessagePrepare);
-            root.uploadSignal.connect(sendUrls);
-            root.sendtextSignal.connect(sendtext);
-            }
-
-        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:(newsSwipeview.stacktype!="DirectMessages")
-            }
-
-//            PropertyChanges {
-//                target: receiverLabel; visible:true; text:qsTr("to")+": "+ conversationModel.get(0).newsitemobject.user.name
-//            }
-
-//            PropertyChanges {
-//                target: messageSend; reply_to_user: conversationModel.get(0).newsitemobject.user.screen_name
-//            }
-
-//            PropertyChanges {
-//                target: messageSend; parentId: conversationModel.get(0).newsitemobject.status_id
-//            }
-        } ]
-}
-//}
diff --git a/source-android/qml/newsqml/NewsImage.qml b/source-android/qml/newsqml/NewsImage.qml
deleted file mode 100644
index b587e22..0000000
--- a/source-android/qml/newsqml/NewsImage.qml
+++ /dev/null
@@ -1,50 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.9
-AnimatedImage {id:gif;
-    width:newscolumn.width;
-    property string mimetype:""
-    fillMode: Image.PreserveAspectFit;
-    onStatusChanged: playing = (status == AnimatedImage.Ready);
-    MouseArea {anchors.fill:parent;
-        onClicked:{
-            if (mimetype!="image/gif"){
-                var attachcomponent = Qt.createQmlObject('import QtQuick 2.0; '+
-                'Rectangle{id:recfullscreen;color:"white";width:root.width;height:root.height;'+
-                'MouseArea {anchors.fill:parent;onClicked:{recfullscreen.destroy()}}'+
-                 'AnimatedImage {id:giffullscreen;source: "'+gif.source+
-                  '";anchors.centerIn:parent; width:root.width;fillMode: Image.PreserveAspectFit; onStatusChanged: playing = (status == AnimatedImage.Ready);'+
-                '}}',root,"Attachmentlarge")
-            }
-        }
-    }
-}
diff --git a/source-android/qml/newsqml/NewsLink.qml b/source-android/qml/newsqml/NewsLink.qml
deleted file mode 100644
index 5d50ab7..0000000
--- a/source-android/qml/newsqml/NewsLink.qml
+++ /dev/null
@@ -1,67 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.9
-import "qrc:/js/helper.js" as Helperjs
-//import QtWebView 1.1
-
-Rectangle{
-    color:"transparent"
-    width:newscolumn.width;
-    height:newscolumn.width/4*3
-    property string url:""//htmlview.text
-
-    Text{id:htmlview
-        textFormat:Text.RichText
-    }
-//    WebView {id:htmlview;
-//        anchors.fill: parent
-//    }
-    Component.onCompleted:{
-
-//        Helperjs.friendicaWebRequest(url,parent,function(document){
-//            print(document);
-
-////            var metas = document.getElementsByTagName('meta'); //get all the meta tag elements
-////        //iterate through them
-////        for (i=0; i<metas.length; i++) {
-////           if (metas[i].getAttribute("name") == "keywords") {
-////             print(metas[i].getAttribute("content"));
-////           }
-////          else if (metas[i].getAttribute("name") == "description") {
-////             console.log(metas[i].getAttribute("content"));
-////           }
-////        }
-//        //print(html);
-//        htmlview.text=""
-//        })
-    }
-}
diff --git a/source-android/qml/newsqml/NewsStack.qml b/source-android/qml/newsqml/NewsStack.qml
deleted file mode 100644
index 5cf9d95..0000000
--- a/source-android/qml/newsqml/NewsStack.qml
+++ /dev/null
@@ -1,579 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.11
-import QtQuick.Controls 2.4
-import "qrc:/js/news.js" as Newsjs
-import "qrc:/js/helper.js" as Helperjs
-import "qrc:/js/service.js" as Service
-
-StackView{
-    id: newsStack
-    anchors.fill: parent
-    property string updateMethodNews: "refresh"
-    property var allchats: ({})
-    signal replySignal(var newsobject)
-    property int lastnewsid:0
-
-   function newstypeHandling(newstype){
-       newsBusy.running=true;
-       replySignal("");
-       //messagesend.state="";
-       newsModel.clear();
-       switch(newstype){
-       case "timeline":
-           newstab.newstabstatus="Timeline";
-           try{ Newsjs.newsfromdb(root.db,root.login,0, function(dbnews,lastid){
-               lastnewsid=lastid;
-               showNews(dbnews)
-           })}catch(e){Helperjs.showMessage("Error",e,root)};
-           break;
-       case "conversation":
-           newstab.newstabstatus="Conversations";
-           Newsjs.chatsfromdb(root.db,root.login,0,function(news,lastid){
-               lastnewsid=lastid;
-               showNews(news)});
-           break;
-       case "favorites":
-           newsStack.updateMethodNews="refresh";
-           newstab.newstabstatus="Favorites";
-           Service.updateView("Favorites");
-           break;
-       case "replies":
-           newsStack.updateMethodNews="refresh";
-           newstab.newstabstatus="Replies";
-           Service.updateView("Replies");
-           break;
-       case "publictimeline":
-           newsStack.updateMethodNews="refresh";
-           newstab.newstabstatus="Public Timeline";
-           Service.updateView("Public Timeline");
-           break;
-       case "groupnews":
-           newsStack.updateMethodNews="refresh";
-           Service.showGroups();
-           break;
-       case "search":
-           newsView.anchors.topMargin=7*mm;
-           newsBusy.running=false;
-           var component = Qt.createComponent("qrc:/qml/genericqml/Search.qml");
-           var searchItem = component.createObject(newsStack,{y:mm,width:root.width,height: 5*mm});
-           break;
-       case "refresh":
-           if (newstab.newstabstatus=="Timeline"){
-               newsStack.updateMethodNews="append"
-           } else {newsStack.updateMethodNews="refresh"}
-           //root.contactLoadType="news";
-           if (newsSwipeview.stacktype=="Home"){
-               Service.updateView(newstab.newstabstatus)
-           }
-           else if (newsSwipeview.stacktype=="DirectMessage"){
-               Service.updateView("Direct Messages")
-           }
-           else if (newsSwipeview.stacktype=="Notifications"){
-               Service.updateView("Notifications")
-           }
-           break;
-       default:
-           if (newstab.newstabstatus=="Timeline"){
-               newsStack.updateMethodNews="append"
-           } else {newsStack.updateMethodNews="refresh"}
-           //root.contactLoadType="news";
-           if (newsSwipeview.stacktype=="Home"){
-               Service.updateView(newstab.newstabstatus)
-           }
-           else if (newsSwipeview.stacktype=="Directmessage"){
-               Service.updateView("Direct Messages")
-           }
-           else if (newsSwipeview.stacktype=="Notifications"){
-               Service.updateView("Notifications")
-           }
-       }
-   }
-
-
-   function showNews(newsToShow){
-      try{
-          if (newsStack.depth>1){newsStack.pop()}
-      }catch(e){}
-      newsBusy.running=false;
-      var currentTime= new Date();
-     // downloadNotice.text=downloadNotice.text + "\n shownews start "+ Date.now();
-      //print("appendnews "+JSON.stringify(newsToShow))
-      var msg = {'currentTime': currentTime, 'model': newsModel,'news':newsToShow,'method':newsStack.updateMethodNews, 'options':globaloptions};
-      newsWorker.sendMessage(msg);
-      //newsStack.appendNews=false
-   }
-
-   function showContact(contact){ //print(JSON.stringify(contact));
-       //newstab.newstabstatus="Contact";
-       newsStack.push("qrc:/qml/newsqml/ContactPage.qml",{"contact": contact});
-   }
-
-   function search(term){//print("Search "+term)
-       if (term!=""){
-       newstab.newstabstatus="Search";
-       newsBusy.running=true;
-       newsStack.updateMethodNews="refresh";
-       xhr.setLogin(login.username+":"+Qt.atob(login.password));
-       xhr.setUrl(login.server);
-       xhr.setApi("/api/search");
-       xhr.clearParams();
-       xhr.setParam("q",term)
-       xhr.get();}
-       newsView.anchors.topMargin=mm
-   }
-
-   Connections{
-       target:xhr
-       onError:{
-           Helperjs.showMessage(qsTr("Network Error"),"API:\n" +login.server+api+"\n Return: \n"+data,root);
-       }
-       onSuccess:{
-          // downloadNotice.text=downloadNotice.text+ "\n xhr finished "+Date.now();
-           Service.processNews(api,data);
-       }
-   }
-
-   Timer {id:replytimer; interval: 1000; running: false; repeat: false
-       onTriggered: {
-           newsBusy.running=true;
-           if(newstab.newstabstatus=="Conversation"){
-               showConversation(newsStack.timelineIndex-1,newsModel.get(0).newsitemobject)}
-           else{
-               if (newstab.newstabstatus=="Timeline"){
-                   newsStack.updateMethodNews="append"
-               } else {newsStack.updateMethodNews="refresh"}
-               if (newsSwipeview.stacktype=="Home"){
-                   Service.updateView(newstab.newstabstatus)
-               }
-               else if (newsSwipeview.stacktype=="DirectMessages"){
-                   Service.updateView("Direct Messages")
-               }
-               else if (newsSwipeview.stacktype=="Replies"){
-                   Service.updateView("Replies")
-               }
-               replySignal("")
-                 //Service.updateView(newstab.newstabstatus)
-           }
-       }
-   }
-
-   initialItem: Rectangle {
-        id:newslistRectangle
-        y:1
-        color: "white"
-
-//        Button{
-//            id:newstabstatusButton
-//            anchors.top: parent.top
-//            anchors.topMargin: 0.5*mm
-//            height: 8*mm
-//            text: qsTr(newstab.newstabstatus)
-//            visible: newsStack.parent.stacktype=="standard"
-//            onClicked: {print(newsStack.parent.stacktype);
-//                newstabmenu.popup(2*mm,6*mm)
-//            }
-
-//            Menu{id:newstabmenu
-//                width: 40*mm
-
-//                delegate:MenuItem{
-//                    contentItem: Text{
-//                        font.pixelSize: 3.5*mm
-//                        text:parent.text
-//                    }
-//                    background: Rectangle {
-//                        implicitWidth: 40*mm; implicitHeight: 5*mm
-//                        color: "#ffffff"
-//                        border.color: "grey"
-//                    }
-//                }
-//                Action {
-//                    text: qsTr("Timeline")
-//                    onTriggered: {
-                   
-//                }
-//                Action {
-//                    text: qsTr("Conversations")
-//                    onTriggered:{
-//                        //newsModel.clear();
-//                        newstab.newstabstatus="Conversations";
-//                        Newsjs.chatsfromdb(db,root.login,function(news){showNews(news)})
-//                    }
-//                }
-//                Action {
-//                    text: qsTr("Favorites")
-//                    onTriggered:{
-//                        newsStack.updateMethodNews="refresh";
-//                        newstab.newstabstatus="Favorites";
-//                        Service.updateView("Favorites")
-//                    }
-//                }
-//                Action {
-//                    text: qsTr("Replies")
-//                    onTriggered:{
-//                        newsStack.updateMethodNews="refresh";
-//                        newstab.newstabstatus="Replies";
-//                        Service.updateView("Replies")
-//                    }
-//                }
-//                Action {
-//                    text: qsTr("Public timeline")
-//                    onTriggered:{
-//                        newsStack.updateMethodNews="refresh";
-//                        newstab.newstabstatus="Public Timeline";
-//                        Service.updateView("Public Timeline")
-//                    }
-//                }
-                
-////                Action {
-////                    text: qsTr("Direct Messages")
-////                    onTriggered:{
-////                        newsStack.updateMethodNews="refresh";
-////                        newstab.newstabstatus="Direct Messages";
-////                        Service.updateView("Direct Messages")
-////                    }
-////                }
-////                Action {
-////                    text: qsTr("Notifications")
-////                    onTriggered:{
-////                        newsStack.updateMethodNews="refresh";
-////                        newstab.newstabstatus="Notifications";
-////                        Service.updateView("Notifications")
-////                    }
-////                }
-//                Action {
-
-//                     text: qsTr("Group news")
-//                     onTriggered:
-//                     {
-//                         newsStack.updateMethodNews="refresh";
-//                         Service.showGroups();
-//                     }
-//                }
-//                 Action {
-
-//                     text: qsTr("Settings")
-//                     onTriggered:
-//                     {
-//                         leftDrawer.open()
-//                     }
-//                }
-                
-//                Action {
-//                    text: qsTr("Quit")
-//                    onTriggered:{
-//                         Service.cleanNews(root.db,function(){
-//                             Service.cleanContacts(root.login,root.db,function(){
-//                                 Qt.quit()})
-//                             })
-//                    }
-//                }
-//            }
-//        }
-
-//        Row{
-//           spacing: mm
-//           anchors.top: parent.top
-//           anchors.topMargin: 0.5*mm
-//           anchors.right: parent.right
-
-//           Button {
-//             id: searchButton
-//             height: 8*mm
-//             text: "\uf002"
-//             visible: newsStack.parent.stacktype=="standard"
-//             onClicked: {
-//                  newsView.anchors.topMargin=18*mm;
-//                  var component = Qt.createComponent("qrc:/qml/genericqml/Search.qml");
-//                  var searchItem = component.createObject(newsStack,{y:8*mm,width:root.width,height: 8*mm});
-//             }
-//           }
-
-//           Button {
-//               id: newMessageButton
-//               text: "\uf040"
-//               height: 8*mm
-//               onClicked: {
-//                   var groups=[];
-//                   Helperjs.readData(root.db,"groups",root.login.username,function(groupobject){
-//                       groups=groupobject
-//                   });
-//                   newstab.newstabstatus="SendMessage";
-//                   Helperjs.readData(root.db,"contacts",root.login.username,function(friends){
-//                      newsStack.push("qrc:/qml/newsqml/MessageSend.qml",{"contacts": friends,"login":root.login})
-//                   },"isFriend",1);
-//               }
-//           }
-//           BlueButton {
-//             id: quitButton
-//             text: "\uf08b"
-//             onClicked: {Service.cleanNews(root.db,function(){
-//                 Service.cleanContacts(root.login,root.db,function(){
-//                    Qt.quit() })
-//             })}
-//           }
-//           Button {
-//            id: update
-//            height: 8*mm
-//            text: "\uf021"
-//            onClicked: {
-//                if (newstab.newstabstatus=="Timeline"){
-//                    newsStack.updateMethodNews="append"
-//                } else {newsStack.updateMethodNews="refresh"}
-//                //root.contactLoadType="news";
-//                if (newsStack.parent.stacktype=="standard"){
-//                    Service.updateView(newstab.newstabstatus)
-//                }
-//                else if (newsStack.parent.stacktype=="directmessage"){
-//                    Service.updateView("Direct Messages")
-//                }
-//                else if (newsStack.parent.stacktype=="notifications"){
-//                    Service.updateView("Notifications")
-//                }
-//            }
-//        }
-
-//        }
-        Component {  id:footerComponent
-            Rectangle{
-                border.color: "#EEEEEE"
-                border.width: 1
-                 width:newsView.width
-                 height:6*mm
-                 Text{
-                     font.pixelSize: 1.5*mm
-                     anchors.centerIn: parent
-                     text:qsTr("More")
-                 }
-                 MouseArea{anchors.fill:parent
-                     onClicked:{
-                        var currentTime= new Date();
-                        var lastnews_id=newsModel.get(newsModel.count-1).newsitemobject.created_at;
-                         var messagetype=0;
-                         switch(newsSwipeview.stacktype){
-                             case "Home":messagetype=0;break;
-                             case "DirectMessages": messagetype=1;break;
-                             case "Notifications":messagetype=2;break;
-                             case "Replies":messagetype=3;break;
-                             default:messagetype=0;
-                         }
-                        if(newstab.newstabstatus=="Timeline"){
-                            Newsjs.newsfromdb(root.db,root.login, messagetype,function(news){
-                                var msg = {'currentTime': currentTime, 'model': newsModel,'news':news,'appendnews':true, 'options':globaloptions};
-                                newsWorker.sendMessage(msg);
-                            },false,lastnews_id)}
-                        if(newstab.newstabstatus=="Conversations"){
-                            Newsjs.chatsfromdb(root.db,root.login, messagetype,function(news){
-                                var msg = {'currentTime': currentTime, 'model': newsModel,'news':news,'appendnews':true, 'options':globaloptions};
-                                newsWorker.sendMessage(msg);
-                            },lastnews_id)}
-//                        else if(newstab.newstabstatus=="Contact"){
-//                            Newsjs.newsfromdb(root.db,root.login, function(news){
-//                                var msg = {'currentTime': currentTime, 'model': newsModel,'news':news,'appendnews':true};
-//                                newsWorker.sendMessage(msg);
-//                            },newsModel.get(newsModel.count-1).newsitemobject.uid,lastnews_id)}
-                        else if (newstab.newstabstatus=="Notifications"){}
-                        else{
-                            //newsStack.appendNews=true;
-                            xhr.setParam("max_id",newsModel.get(newsModel.count-1).newsitemobject.id-1);
-                            xhr.get()
-                     }}
-                 }
-             }
-        }
-
-
-
-//        Label{
-//            text:qsTr(stacktype)
-//            font.pixelSize: 3* mm
-//            anchors.horizontalCenter: parent.horizontalCenter
-//            anchors.margins: mm
-//        }
-
-        ListView {
-          id: newsView
-          property real oldContentY:0
-          property bool viewdragged: false
-          anchors.fill: parent
-          anchors.margins: mm
-          //anchors.topMargin: 6*mm
-//          anchors.leftMargin: mm; anchors.rightMargin: mm
-//          anchors.bottomMargin: mm
-          clip: true
-          spacing: 0
-          header: MessageSend{id:messagesend;onHeightChanged: newsView.positionViewAtBeginning()}
-          footer: footerComponent
-          model: newsModel
-          delegate: Newsitem{}
-          onDragStarted: oldContentY=contentY
-          onDragEnded: {
-              if(verticalOvershoot<-5*mm){
-                viewdragged=true
-            }
-              else{
-                if((contentY-oldContentY)>15*mm){
-                    swipeIndicator.visible=false;
-                    newsSwipeview.height=rootStackItem.height;
-                    newsSwipeview.y=0;
-                    rootStackItem.state="fullscreen"
-                }
-                else if ((contentY-oldContentY)<-15*mm){
-                    swipeIndicator.visible=true;
-                    newsSwipeview.height=rootStackItem.height-12*mm;
-                    newsSwipeview.y=5*mm;
-                    rootStackItem.state=""
-                }
-              }
-              }
-          onViewdraggedChanged: {
-              if (viewdragged){
-                  var onlynew=true;
-                  newsBusy.running=true;
-                  if (newstab.newstabstatus=="Timeline"){
-                      newsStack.updateMethodNews="append"
-                  } else {newsStack.updateMethodNews="refresh"}
-                //root.contactLoadType="news";
-                    if (newsSwipeview.stacktype=="Home"){
-                        Newsjs.getLastNews(root.login,root.db,function(currentlastnews){
-                            if (currentlastnews>lastnewsid){
-                                if(newstab.newstabstatus=="Timeline"){
-                                    try{ Newsjs.newsfromdb(root.db,root.login,0, function(dbnews,lastid){
-                                        lastnewsid=lastid;
-                                        showNews(dbnews)
-                                    })}catch(e){Helperjs.showMessage("Error",e,root)};
-                                }
-                                if(newstab.newstabstatus=="Conversations"){
-                                    Newsjs.chatsfromdb(db,root.login,0,function(news,lastid){
-                                        lastnewsid=lastid;
-                                        showNews(news)});
-                                }
-                            }  else {
-                                Service.updateView(newstab.newstabstatus)
-                            }
-                        });
-                    }
-                else if (newsSwipeview.stacktype=="DirectMessages"){
-                    Service.updateView("Direct Messages")
-                }
-                else if (newsSwipeview.stacktype=="Notifications"){
-                    Service.updateView("Notifications")
-                }
-                else if (newsSwipeview.stacktype=="Replies"){
-                    Service.updateView("Replies")
-                }
-                    viewdragged=false
-              }}
-          }
-          
-       ListModel{id: newsModel}
-
-       WorkerScript {
-              id: newsWorker
-              source: "qrc:/js/newsworker.js"
-          }
-       
-       BusyIndicator{
-         id: newsBusy
-         anchors.horizontalCenter: parent.horizontalCenter
-         anchors.top:parent.top
-         anchors.topMargin: 2*mm
-         width:10*mm
-         height: 10*mm
-       }
-       Rectangle{
-          id:downloadNotice
-          property alias text: noticeText.text
-          color:"white"
-          border.color:"grey"
-          z:1
-          anchors.horizontalCenter: parent.horizontalCenter
-          anchors.bottom:parent.bottom
-          anchors.bottomMargin: 2*mm
-          width: noticeText.width+2*mm
-          height: noticeText.height+2*mm
-          visible: (downloadNotice.text!="")
-          
-          Text{
-              id:noticeText
-              color: "grey"
-              anchors.centerIn: parent
-              width: contentWidth
-              height: contentHeight
-              font.pixelSize: 2*mm
-              text:""
-          }
-       }
-
-        Component.onCompleted: {
-            //print(newsSwipeview.stacktype);
-            root.newstypeSignal.connect(newstypeHandling);
-            root.messageSignal.connect(onFriendsMessages);
-            root.contactdetailsSignal.connect(showContact);
-            root.newsSignal.connect(showNews);
-
-            try{newsModel.clear()} catch(e){}
-            swipeIndicator.visible=true;
-            newsSwipeview.height=rootStackItem.height-12*mm;
-            newsSwipeview.y=5*mm;
-            rootStackItem.state=""
-           
-//           xhr.setLogin(login.username+":"+Qt.atob(login.password));
-//           xhr.setUrl(login.server);
-//            if((newsStack.parent.stacktype=="standard") && (root.news.length>0)){
-//                showNews(root.news)
-//            }
-            //else{
-            newstab.newstabstatus=login.newsViewType;
-            var messagetype=0;
-            switch(newsSwipeview.stacktype){
-                case "Home":messagetype=0;break;
-                case "DirectMessages": messagetype=1;break;
-                case "Notifications":messagetype=2;break;
-                case "Replies":messagetype=3;break;
-                default:messagetype=0;
-            }
-            if((login.newsViewType=="Conversations")&&(newsSwipeview.stacktype=="Home")){
-                Newsjs.chatsfromdb(db,login,messagetype,function(dbnews,lastid){
-                    lastnewsid=lastid;
-                    showNews(dbnews);
-                })
-            }
-            else{Newsjs.newsfromdb(db,login,messagetype,function(dbnews,lastid){
-                lastnewsid=lastid;
-                showNews(dbnews)
-             })}
-            //}
-        }
-    }
-}
diff --git a/source-android/qml/newsqml/NewsTab.qml b/source-android/qml/newsqml/NewsTab.qml
deleted file mode 100644
index 248bee5..0000000
--- a/source-android/qml/newsqml/NewsTab.qml
+++ /dev/null
@@ -1,184 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.11
-import QtQuick.Controls 2.4
-//import QtQuick.Controls.Styles 2.3
-//import QtQuick.Dialogs 1.3
-import "qrc:/qml/newsqml"
-import "qrc:/js/news.js" as Newsjs
-import "qrc:/js/helper.js" as Helperjs
-import "qrc:/js/service.js" as Service
-
-Item {
-
-//    Connections{
-//        target:xhr
-//        onError:{
-//            Helperjs.showMessage(qsTr("Network Error"),"API:\n" +login.server+api+"\n Return: \n"+data,root);
-//        }
-//        onSuccess:{
-//            if (api=="/api/statuses/friends_timeline"){
-//           // downloadNotice.text=downloadNotice.text+ "\n xhr finished "+Date.now();
-//            //Service.processNews(api,data);
-//                if(login.newsViewType=="Timeline"){
-//                    Newsjs.newsfromdb(db,login.username,function(dbnews){showNews(dbnews)})}
-//                else{Newsjs.chatsfromdb(db,login.username,function(dbnews){
-//                    showNews(dbnews);
-//                })}
-//            }
-//        }
-//    }
-
-
-
-
-    Timer {id:contacttimer; interval: 50; running: false; repeat: false
-        onTriggered: {//print("Contacttimer "+JSON.stringify(root.news));
-           // downloadNotice.text=downloadNotice.text + "\n contactTimer start "+ Date.now()
-            root.newContacts=Newsjs.findNewContacts(root.news,root.contactlist);
-            Newsjs.storeNews(login,db,root.news,root)
-        }
-    }
-
-    function showConversation(conversationIndex,newsitemobject){
-        if(newsitemobject.messagetype==0 || newsitemobject.messagetype==3){
-            xhr.clearParams();
-            xhr.setLogin(login.username+":"+Qt.atob(login.password));
-            xhr.setUrl(login.server);
-            xhr.setApi("/api/conversation/show");
-            xhr.setParam("id",newsitemobject.id)
-            xhr.get();
-        }
-        else{
-            xhr.clearParams();
-            xhr.setLogin(login.username+":"+Qt.atob(login.password));
-            xhr.setUrl(login.server);
-            xhr.setApi("/api/direct_messages/conversation");
-            xhr.setParam("uri",newsitemobject.statusnet_conversation_id)
-            xhr.get();
-        }
-    }
-
-
-    function onFriendsMessages(friend){
-        newstab.newstabstatus="Contact"
-        Newsjs.newsfromdb(db,root.login.username, 0,function(dbnews){
-            if (dbnews.length==0){
-                Newsjs.newsfromdb(db,login.username,0,function(forumnews){
-                    showNews(forumnews)
-                },friend.url)
-            }
-           else showNews(dbnews)
-       },friend.id)
-    }
-
-    Label{
-        text:"\uf0c9 "
-        font.pixelSize: 5* mm
-        anchors.left: parent.left
-        anchors.margins: mm
-        color: "#B0BEC5"
-        MouseArea{
-            anchors.fill: parent
-            onClicked:{
-                leftDrawer.open()
-            }
-        }
-    }
-    Label{
-        text:qsTr(newsSwipeview.stacktype)
-        font.pixelSize: 3* mm
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.margins: 2*mm
-    }
-    SwipeView{
-        id: newsSwipeview
-        property string stacktype:"Home"
-        currentIndex: 0
-        width: parent.width
-        height: parent.height-6*mm
-        y: 5*mm
-        function onDirectMessage(friend){currentIndex=2}
-
-        transitions: Transition {
-            PropertyAnimation { properties: "height";
-                easing.type: Easing.InOutQuad
-                duration: 1000
-            }
-        }
-
-        onCurrentIndexChanged: {
-            switch(currentIndex){
-                case 0: stacktype="Home";break;
-                case 1: stacktype="Replies";break;
-                case 2: stacktype="DirectMessages";break;
-                case 3: stacktype="Notifications";break;
-               default: stacktype="Home";
-            }
-        }
-        //anchors.fill: parent
-        Loader{
-            id: friendstimeline
-            source:(newsSwipeview.currentIndex==0)? "qrc:/qml/newsqml/NewsStack.qml":""
-            //onLoaded: newsSwipeview.stacktype="Home"
-        }
-        Loader{
-            id: replies
-            //property string stacktype:"Replies"
-            source:(newsSwipeview.currentIndex==1)? "qrc:/qml/newsqml/NewsStack.qml":""
-            //onLoaded: newsSwipeview.stacktype="Replies"
-        }
-        Loader{
-            id: directmessages
-            property var friend:({})
-            source:(newsSwipeview.currentIndex==2)? "qrc:/qml/newsqml/NewsStack.qml":""
-            //onLoaded: newsSwipeview.stacktype="DirectMessages"
-        }
-        Loader{
-            id: notifications
-            //property string stacktype:"Notifications"
-            source:(newsSwipeview.currentIndex==3)? "qrc:/qml/newsqml/NewsStack.qml":""
-            //onLoaded: newsSwipeview.stacktype="Notifications"
-        }
-        Component.onCompleted: {root.directmessageSignal.connect(onDirectMessage);}
-    }
-
-    PageIndicator {
-        id: swipeIndicator
-        count: newsSwipeview.count
-        currentIndex: newsSwipeview.currentIndex
-
-        anchors.bottom: newsSwipeview.bottom
-        anchors.horizontalCenter: parent.horizontalCenter
-    }
-
-}
diff --git a/source-android/qml/newsqml/NewsYplayer.qml b/source-android/qml/newsqml/NewsYplayer.qml
deleted file mode 100644
index 11d01c2..0000000
--- a/source-android/qml/newsqml/NewsYplayer.qml
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.8
-import "qrc:/js/helper.js" as Helperjs
-//import QtWebView 1.1
-
-Rectangle{
-    color:"transparent"
-    width:newscolumn.width;
-    height:newscolumn.width/4*3
-    property string url:""//htmlview.text
-    WebView {
-        id: webView
-        anchors.fill: parent
-        opacity: 0
-
-        url: "qrc:///content/player.html?" + currentVideo.vId
-
-        Behavior on opacity { NumberAnimation { duration: 200 } }
-
-        onLoadingChanged: {
-            switch (loadRequest.status)
-            {
-            case WebView.LoadSucceededStatus:
-                opacity = 1
-                return
-            case WebView.LoadStartedStatus:
-            case WebView.LoadStoppedStatus:
-                break
-            case WebView.LoadFailedStatus:
-                topInfo.text = "Failed to load the requested video"
-                break
-            }
-            opacity = 0
-        }
-        onTitleChanged: {
-            currentVideo.status = 1 * title
-            if (title == videoStatus.paused || title == videoStatus.ready)
-                panel.state = "list"
-            else if (title == videoStatus.playing)
-                panel.state = "hidden"
-        }
-    }
-    Text{id:htmlview
-        textFormat:Text.RichText
-    }
-//    WebView {id:htmlview;
-//        anchors.fill: parent
-//    }
-    Component.onCompleted:{
-
-//        Helperjs.friendicaWebRequest(url,parent,function(document){
-//            print(document);
-
-////            var metas = document.getElementsByTagName('meta'); //get all the meta tag elements
-////        //iterate through them
-////        for (i=0; i<metas.length; i++) {
-////           if (metas[i].getAttribute("name") == "keywords") {
-////             print(metas[i].getAttribute("content"));
-////           }
-////          else if (metas[i].getAttribute("name") == "description") {
-////             console.log(metas[i].getAttribute("content"));
-////           }
-////        }
-//        //print(html);
-//        htmlview.text=""
-//        })
-    }
-}
diff --git a/source-android/qml/newsqml/Newsitem.qml b/source-android/qml/newsqml/Newsitem.qml
deleted file mode 100644
index 8dabc67..0000000
--- a/source-android/qml/newsqml/Newsitem.qml
+++ /dev/null
@@ -1,484 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.0
-import QtQuick.Controls 2.4
-//import QtQuick.Controls.Styles 1.4
-import "qrc:/js/news.js" as Newsjs
-import "qrc:/js/helper.js" as Helperjs
-import "qrc:/qml/genericqml"
-
-Item {
-    id: newsitem
-    width: parent.width
-    height:toprow.height+friendicaActivities.height+controlrow.height+1//Math.max((itemMessage.height+topFlow.height+friendicaActivities.height+4*mm),profileImage.height+user_name.height+mm)
-    property int itemindex: index
-
-    property string attending: ""
-    onAttendingChanged: {attendLabel.visible=true;
-            attendLabel.text= qsTr("attending: ")+ qsTr(attending)}
-
-    signal replyto(string parent_id)
-
-    function showActivityContacts(contacts){
-        var component = Qt.createComponent("qrc:/qml/newsqml/FriendicaActivities.qml");
-        var imagedialog = component.createObject(friendicaActivities,{"activitymembers": contacts});
-    }
-
-    function findTags(fulltext){
-       return fulltext.match(/\s+[#]+[A-Za-z0-9-_\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF]+/g)
-    }
-
-    Rectangle{width:newsitem.width; height: 1; anchors.bottom: newsitem.bottom; color:"light grey"}
-
-    Rectangle{
-    width:newsitem.width
-    height:newsitem.height-1
-    color:  "white"//(newsitemobject.messagetype==1)?"#ffe6e6" : "white"
-
-    Row{id:toprow
-        Column {
-        id: authorcolumn
-        width: 8*mm
-
-        Image {
-            id:profileImage
-            source: ((newsitemobject.user.profile_image!="") && (typeof(newsitemobject.user.profile_image)=="string"))? "file://"+newsitemobject.user.profile_image : newsitemobject.user.profile_image_url
-            x:1
-            width: 7*mm
-            height: 7*mm
-            MouseArea{
-                anchors.fill: parent
-                onClicked:{
-                    showContact(newsitemobject.user)}
-            }
-            onStatusChanged: if (profileImage.status == Image.Error) {source="qrc:/images/defaultcontact.jpg"}
-        }
-        Label {
-            id:user_name
-            color: "grey"
-            width:parent.width
-            font.pixelSize: 1.5*mm
-            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-            text: newsitemobject.user.name+forumname
-        }
-    }
-    Column {
-        id:newscolumn
-        width: newsitem.width-8*mm
-
-        Flow{
-            id:topFlow
-            spacing: mm
-            width:parent.width
-            Label {
-                id:messageTypeLabel
-                color: "grey"
-                text: if (newsitemobject.messagetype==1){ qsTr("Direct Message")} else if(newsitemobject.messagetype==2) {" Notification"} else {qsTr("Source: ")+newsitemobject.source}
-                font.pixelSize: 1.5*mm
-            }
-            Label {
-                id:createdAtLabel
-                color: "grey"
-                font.pixelSize: 1.5*mm
-                horizontalAlignment: Label.AlignRight
-                text: dateDiff
-            }
-            Label {
-                id:replytoLabel
-                color: "grey"
-                font.pixelSize: 1.5*mm
-                font.family: "Noto Sans"
-                horizontalAlignment: Label.AlignRight
-                text:   try {qsTr("In reply to ")+newsitemobject.reply_user.screen_name
-                      }catch(e){" "}
-                }
-
-            Label {
-                id:newscountLabel
-                visible:((newstabstatus=="Conversations")&&(newsitemobject.newscount>1))?true:false
-                color: "grey"
-                height:3.5*mm
-                font.pixelSize: 1.5*mm
-                font.bold: true
-                horizontalAlignment: Label.AlignRight
-                text:   try {(newsitemobject.newscount-1)+qsTr(" comments") }catch(e){" "}
-                MouseArea{
-                    anchors.fill:parent
-                    onClicked: {
-                        newsStack.push("qrc:/qml/newsqml/Conversation.qml");
-                        showConversation(index,newsitemobject)
-                    }
-                }
-            }
-        }
-
-
-          Column{ id: messageColumn
-             //anchors.top:topFlow.bottom
-             width:parent.width
-             spacing:mm
-             clip:true
-             height: Math.min(implicitHeight,3/4*root.height)
-        MouseArea{
-            width: newsitem.width-8*mm-2
-            height: itemMessage.height
-            onPressAndHold: {
-                newsStack.push("qrc:/qml/newsqml/Conversation.qml");
-                showConversation(index,newsitemobject)
-            }
-            Text {
-            color: "#404040"
-            linkColor: "light green"
-            id: itemMessage
-            textFormat: Text.RichText
-            font.family: "Noto Sans"
-            text: newsitemobject.statusnet_html//newsitemobject.attachmentList.length>0?newsitemobject.text : newsitemobject.statusnet_html
-            width: newsitem.width-8*mm-2
-            height: implicitHeight
-            wrapMode: Text.Wrap
-            clip:true
-            //MouseArea{anchors.fill:parent;onClicked: print("Test")}
-            onLinkActivated:{ 
-               Qt.openUrlExternally(link)}
-            Component.onCompleted:{
-               if (newsitemobject.messagetype==0){
-                var hashtags=[];
-                hashtags=findTags(newsitemobject.text);
-                var component = Qt.createComponent("qrc:/qml/newsqml/Hashtag.qml");
-                for (var tags in hashtags){
-                    var hashtagQml = component.createObject(friendicaActivities,{"text":hashtags[tags].trim()});
-                }}
-
-                if (newsitemobject.attachmentList.length>0){
-                    for(var attachments in newsitemobject.attachmentList){//   (newsitemobject.attachmentList[attachments].url);
-                        if(newsitemobject.attachmentList[attachments].mimetype.substring(0,5)=="image"){
-                            var component = Qt.createComponent("qrc:/qml/newsqml/NewsImage.qml");
-                            var imageQml = component.createObject(messageColumn,{"source":newsitemobject.attachmentList[attachments].url,"mimetype":newsitemobject.attachmentList[attachments].mimetype});
-                        }
-                        else if(newsitemobject.attachmentList[attachments].mimetype=="text/html"){
-                            var component = Qt.createComponent("qrc:/qml/newsqml/NewsLink.qml");
-                            var linkQml = component.createObject(messageColumn,{"url":newsitemobject.attachmentList[attachments].url});
-                        }
-                        else {//print(newsitemobject.attachmentList[attachments].url+" Type: "+newsitemobject.attachmentList[attachments].mimetype)
-                            var component = Qt.createComponent("qrc:/qml/newsqml/NewsVideo.qml");
-                            var videoQml = component.createObject(messageColumn,{"source":newsitemobject.attachmentList[attachments].url,"mimetype":newsitemobject.attachmentList[attachments].mimetype});
-                        }
-                    }
-                }
-            }
-        }}
-          }
-          BlueButton{
-              width: newsitem.width-8*mm-2
-              height:5*mm
-              //anchors.bottom: messageColumn.bottom//itemMessage.bottom
-              visible: messageColumn.implicitHeight>3/4*root.height//itemMessage.implicitHeight>3/4*root.height
-              text:"\uf078"
-              fontColor:"grey"
-              border.color: "transparent"
-              color:"white"
-//              gradient: Gradient {
-//                  GradientStop { position: 0.0; color: "transparent" }
-//                  GradientStop { position: 0.5; color: "white" }
-//              }
-              radius:0
-              onClicked: {
-                  if (text=="\uf078"){
-                      messageColumn.height=messageColumn.implicitHeight+10*mm;text="\uf077"
-                  } else {
-                      messageColumn.height=Math.min(messageColumn.implicitHeight,3/4*root.height);
-                      text="\uf078";
-                      newsView.positionViewAtIndex(index,ListView.Beginning);
-                  }
-              }
-          }
-    }
-    }
-    Flow{
-       id:friendicaActivities
-       anchors.top:toprow.bottom
-       width:parent.width
-       spacing:mm
-
-       Label{color: "grey"
-             height:3.5*mm
-             font.pixelSize: 1.5*mm
-             text: friendica_activities.likeText
-             MouseArea{
-                 anchors.fill: parent
-                 onClicked: { showActivityContacts(newsitemobject.friendica_activities.like)}
-             }
-       }
-       Label{color: "grey"
-             height:3.5*mm
-             font.pixelSize: 1.5*mm
-             text: friendica_activities.dislikeText
-             MouseArea{
-                 anchors.fill: parent
-                 onClicked: { showActivityContacts(newsitemobject.friendica_activities.dislike)}
-             }
-       }
-       Label{color: "grey"
-             height:3.5*mm
-             font.pixelSize: 1.5*mm
-             text: friendica_activities.attendyesText
-             MouseArea{
-                 anchors.fill: parent
-                 onClicked: { showActivityContacts(newsitemobject.friendica_activities.attendyes)}
-             }}
-       Label{color: "grey"
-             height:3.5*mm
-             font.pixelSize: 1.5*mm
-             text: friendica_activities.attendnoText
-             MouseArea{
-                 anchors.fill: parent
-                 onClicked: { showActivityContacts(newsitemobject.friendica_activities.attendno)}
-             }
-       }
-       Label{color: "grey"
-             height:3.5*mm
-             font.pixelSize: 1.5*mm
-             text: friendica_activities.attendmaybeText
-             MouseArea{
-                 anchors.fill: parent
-                 onClicked: { showActivityContacts(newsitemobject.friendica_activities.attendmaybe)}
-             }
-       }
-       Label{
-           id:attendLabel
-           color: "grey"
-           height:3.5*mm
-           font.pixelSize: 1.5*mm
-           horizontalAlignment: Label.AlignRight
-           text: (friendica_activities.self.attending)?(qsTr("Attending: ")+ qsTr(friendica_activities.self.attending)):""
-       }
-   }
-   Row{id:controlrow
-       anchors.top:friendicaActivities.bottom
-
-       CheckBox{
-           id:likeCheckbox
-           width:10*mm
-           visible: ((newsitemobject.messagetype==0)||(newsitemobject.messagetype==3))? true:false
-           checked:(friendica_activities.self.liked==1)?true:false
-           //style: CheckBoxStyle {
-                indicator: Rectangle{
-                    implicitWidth: 10*mm
-                    implicitHeight:3*mm
-                    Text{
-                        anchors.centerIn: parent
-                        font.pixelSize: 2.5*mm
-                        font.family:fontAwesome.name
-                        color:likeCheckbox.checked?"black": "grey"
-                        text:likeCheckbox.checked?"\uf118"+"!":"\uf118"
-                    }
-                }
-           //}
-           onClicked: {
-            if(likeCheckbox.checked==true){Newsjs.like(root.login,root.db,1,"like",newsitemobject.id,root);dislikeCheckbox.checked=false; model.friendica_activities.self.liked=0 }
-            else{Newsjs.like(root.login,root.db,0,"like",newsitemobject.id,root); model.friendica_activities.self.liked=1}}
-           }
-       CheckBox{
-           id: dislikeCheckbox
-           width:10*mm
-           visible: ((newsitemobject.messagetype==0)||(newsitemobject.messagetype==3))? true:false
-           checked: (friendica_activities.self.disliked==1)?true:false
-           //style: CheckBoxStyle {
-            indicator: Rectangle{
-                implicitWidth: 10*mm
-                implicitHeight:3*mm
-                Text{
-                    anchors.centerIn: parent
-                    font.pixelSize: 2.5*mm
-                    font.family:fontAwesome.name
-                    color:dislikeCheckbox.checked?"black": "grey"
-                    text:  dislikeCheckbox.checked?"\uf119"+"!":"\uf119"
-                    }
-                }
-           //}
-           onClicked: {
-            if (dislikeCheckbox.checked==true){Newsjs.like(root.login,root.db,1,"dislike",newsitemobject.id,root);likeCheckbox.checked=false; model.friendica_activities.self.disliked=0}
-            else {Newsjs.like(root.login,root.db,0,"dislike",newsitemobject.id,root); model.friendica_activities.self.disliked=1}}
-           }
-
-       CheckBox {
-           id:favoritedCheckbox
-           visible:((newsitemobject.messagetype==0)||(newsitemobject.messagetype==3))
-           width: 10*mm
-           //style: CheckBoxStyle {
-               indicator:Rectangle{
-                   x:4*mm
-                   width: 3*mm
-                   implicitHeight:4*mm
-                    Text{
-                        color: favoritedCheckbox.checked?"black":"grey"
-                        font.pixelSize: 2.5*mm
-                        text:"\uf005"
-                        }
-               }
-           //}
-           checked:(newsitemobject.favorited>0)
-           onClicked:{
-               if(favoritedCheckbox.checkedState==Qt.Checked){
-                   Newsjs.favorite(login,true,newsitemobject.id,root); model.newsitemobject.favorited=1}
-               else if(favoritedCheckbox.checkedState==Qt.Unchecked){
-                   Newsjs.favorite(login,false,newsitemobject.id,root);model.newsitemobject.favorited=0}
-           }
-       }
-       Rectangle{
-            width: 10*mm
-            height: 4*mm
-            visible:(newsitemobject.messagetype!==2)
-            color:"transparent"
-            Text{
-                id:newsmenusymbol
-                color: "grey"
-                anchors.centerIn: parent
-                font.pixelSize: 2.5*mm
-                font.family:fontAwesome.name
-                text: "\uf142"
-            }
-            MouseArea{
-                anchors.fill:parent
-                onClicked: {newsmenu.popup()}}
-            }
-       Rectangle{
-            width: 10*mm
-            height: 4*mm
-            visible:(newsitemobject.messagetype!==2)&&(newstab.newstabstatus!="Conversation")
-            color:"transparent"
-            Text{
-                id:conversationsymbol
-                color: "grey"
-                anchors.centerIn: parent
-                font.pixelSize: 2.5*mm
-                font.family: fontAwesome.name
-                text: "\uf086"
-            }
-            MouseArea{
-                anchors.fill:parent
-                onClicked:{
-                    //conversationsymbol.color="black";
-//                    var component = Qt.createComponent("qrc:/qml/newsqml/Conversation.qml");
-//                    var conversationItem = component.createObject(friendicaActivities);
-                    newsStack.push("qrc:/qml/newsqml/Conversation.qml")
-                    showConversation(index,newsitemobject)
-                }
-            }
-        }
-
-    }
-
-    Menu {
-        id:newsmenu
-        width: 30*mm
-        delegate: MenuItem{
-            contentItem: Text{
-                font.pixelSize: 3*mm
-                text: parent.text
-            }
-        }
-        Action{
-            text: qsTr("Reply")
-            onTriggered: {
-                var directmessage=0;
-                if (newsitemobject.messagetype==1){ directmessage=1}
-                replySignal(newsitemobject)
-                //newsStack.push("qrc:/qml/newsqml/MessageSend.qml",{"reply_to_user": newsitemobject.user.screen_name,"parentId":newsitemobject.id,"login":root.login,"directmessage":directmessage});
-            }
-        }
-        Action {
-            text: qsTr("DM")
-            onTriggered: {
-                root.directmessageSignal(newsitemobject.user.screen_name);
-            }
-        }
-        Action {
-            text: qsTr("Repost")
-            onTriggered: {
-                Newsjs.retweetNews(root.login,db,newsitemobject.id,root,function(reply){
-                    Helperjs.showMessage("Repost",qsTr("Success!"),root)
-                })
-            }
-        }
-        Action {
-            text: qsTr("Conversation")
-            onTriggered: {
-                conversationsymbol.color="black";
-                var component = Qt.createComponent("qrc:/qml/newsqml/Conversation.qml");
-                var conversationItem = component.createObject(friendicaActivities,{"news":newsitemobject.chatArray});
-                showConversation(index,newsitemobject)
-            }
-        }
-
-        Menu{
-            title: qsTr("Attending")
-            width: 20*mm
-            delegate: MenuItem{
-                contentItem: Text{
-                    font.pixelSize: 3*mm
-                    text: parent.text
-                }
-            }
-            Action{
-                text:qsTr("yes")
-                onTriggered: {Newsjs.attend(root.login,db,"yes",newsitemobject.id,root,function(){
-                    model.friendica_activities.self.attending="yes";attending="yes"})
-                }
-            }
-            Action{text:qsTr("maybe")
-                onTriggered: {Newsjs.attend(root.login,db,"maybe",newsitemobject.id,root,function(){
-                    model.friendica_activities.self.attending="maybe";attending="maybe"})
-                }
-            }
-            Action{text:qsTr("no")
-                onTriggered: {Newsjs.attend(root.login,db,"no",newsitemobject.id,root,function(){
-                model.friendica_activities.self.attending="no";attending="no"})}
-            }
-        }
-
-        Action {
-            text: qsTr("Delete")
-            onTriggered: {
-                Newsjs.deleteNews(root.login,root.db,newsitemobject.id,newsitemobject.messagetype,root,function(reply){
-                   var msg = {'deleteId': index, 'model': newsModel};
-                newsWorker.sendMessage(msg);
-                })
-            }
-        }
-
-        //MenuItem{
-        //    text:qsTr("Show on website")
-        //    onTriggered:Qt.openUrlExternally(login.server+"/display/"+newsitemobject
-        //}
-    }
-}}
diff --git a/source-android/qml/newsqml/PermissionDialog.qml b/source-android/qml/newsqml/PermissionDialog.qml
deleted file mode 100644
index 23aa704..0000000
--- a/source-android/qml/newsqml/PermissionDialog.qml
+++ /dev/null
@@ -1,229 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.0
-import QtQuick.Controls 2.3
-import "qrc:/js/service.js" as Service
-import "qrc:/js/helper.js" as Helperjs
-import "qrc:/qml/genericqml"
-
-Rectangle{
-    id:permissionDialog
-    x: mm
-    width: messageColumn.width-3*mm
-    height:root.height/3
-    function updatePerms(){
-        for (var i=0;i<groupModel.count;i++)
-        {if (groupModel.get(i).groupstatus=="positive"){
-             group_allow.push(groupModel.get(i).group.gid)
-             }
-         if (groupModel.get(i).groupstatus=="negative"){
-             group_deny.push(groupModel.get(i).group.gid)
-             }
-         }
-        for (var j=0;j<contactModel.count;j++){
-         if (contactModel.get(j).contactstatus=="positive"){
-             contact_allow.push(contactModel.get(j).contact.cid)
-             }
-         if (contactModel.get(j).contactstatus=="negative"){
-             contact_deny.push(contactModel.get(j).contact.cid)
-             }
-             if ((contact_allow.length==0)&&(contact_deny.length==0)&&(group_allow.length==0)&&(group_deny.length==0))
-             {permButton.text="\uf09c"}
-             else{permButton.text="\uf023"}
-         }}
-
-    Text{
-         x:0.5*mm
-         y:0.5*mm
-         text: qsTr("Friends")
-         font.pixelSize: 2*mm
-    }
-    ListView {
-          id: contactView
-          x:0.5*mm
-          y:5.5*mm
-          width: permissionDialog.width/2-2*mm
-          height: permissionDialog.height-14*mm
-          clip: true
-          spacing: 1
-          model: contactModel
-          delegate: contactItem
-     }
-
-     ListModel{id: contactModel}
-     Component{
-         id:contactItem
-         Rectangle{
-             id:contactitemRect
-             width:contactView.width
-             height: 5*mm
-             radius: 0.5*mm
-             property string contactstatus
-             onContactstatusChanged:{
-                 if(contactstatus=="positive"){contactitemRect.color="light green"}
-                   else if (contactstatus=="negative"){contactitemRect.color= "ffe6e6"}
-                   else{contactitemRect.color= "white"}}
-             color: "white"
-             border.color:"grey"
-             Text{
-               color:"grey"
-               text:contact.screen_name
-               font.pixelSize: 2*mm
-               }
-            MouseArea{
-                anchors.fill: parent
-                onClicked:{
-                    if(contactModel.get(index).contactstatus=="neutral"){
-                        contactModel.set(index,{"contactstatus":"positive"});
-                        contactstatus="positive"
-                    }
-                    else if (contactModel.get(index).contactstatus=="positive"){
-                        contactModel.set(index,{"contactstatus":"negative"})
-                        contactstatus="negative"
-                    }
-                    else{contactModel.set(index,{"contactstatus":"neutral"});
-                        contactstatus="neutral";
-                    }
-             }}
-          Component.onCompleted:{
-                    if (contactModel.get(index).contactstatus=="positive"){
-                  contactstatus="positive"
-              }
-              else if (contactModel.get(index).contactstatus=="negative"){
-                  contactstatus="negative"
-              }
-               else {contactstatus="neutral"}  }
-          }
-      }
-     Text{
-         x:contactView.width+2*mm
-         y:0.5*mm
-         text: qsTr("Groups")
-         font.pixelSize: 2*mm
-    }
-    ListView {
-          id: groupView
-          x:contactView.width+2*mm
-          y:5.5*mm
-          width: permissionDialog.width/2-2*mm
-          height: permissionDialog.height-14*mm
-          clip: true
-          spacing: 1
-          model: groupModel
-          delegate: groupItem
-     }
-
-     ListModel{id: groupModel}
-     Component{
-          id:groupItem
-          Rectangle{
-             id:groupitemRect
-             width:groupView.width
-             radius: 0.5*mm
-             height: 5*mm
-             property string groupstatus:"neutral"
-             onGroupstatusChanged:
-                {if(groupstatus=="positive"){groupitemRect.color="light green"}
-                 else if (groupstatus=="negative"){groupitemRect.color= "#ffe6e6"}
-                 else{groupitemRect.color= "white"}}
-             color: "white"
-             border.color:"grey"
-              Text{
-                  color:"grey"
-                  text:group.groupname
-                  font.pixelSize: 2*mm
-                   }
-               MouseArea{
-                anchors.fill: parent
-                onClicked:{
-                    if(groupModel.get(index).groupstatus=="neutral"){
-                        groupModel.set(index,{"groupstatus":"positive"});
-                        groupstatus="positive"}
-                    else if (groupModel.get(index).groupstatus=="positive"){
-                        groupModel.set(index,{"groupstatus":"negative"});
-                        groupstatus="negative"}
-                   else{groupModel.set(index,{"groupstatus":"neutral"})
-                    groupstatus="neutral"}
-                }}
-             Component.onCompleted:{ if (groupModel.get(index).groupstatus=="positive"){
-                  groupstatus="positive"
-              }
-              else if (groupModel.get(index).groupstatus=="negative"){
-                  groupstatus="negative"
-              }
-               else {groupstatus="neutral"}  }
-              }
-      }
-     MButton{
-         x:0.5*mm
-         height: 6*mm
-         width: 8*mm
-         anchors.bottom: parent.bottom
-         anchors.bottomMargin:1
-         text:"\uf0c7"
-         onClicked:{
-            updatePerms();
-            var perms=[];
-            perms.push(contact_allow,contact_deny,group_allow,group_deny);
-            Service.savePermissions(db,perms)
-                   }
-      }
-      MButton{
-         x:contactView.width+2*mm
-         height: 6*mm
-         width: 8*mm
-         anchors.bottom: parent.bottom
-         anchors.bottomMargin:1
-         text:"\u2713"
-         onClicked:{updatePerms();
-                    permissionDialog.destroy();
-                    }
-        }
-
-     Component.onCompleted:{
-         Helperjs.readData(db,"contacts",login.username,function(contacts){
-            for (var name in contacts){
-               var contactstatus="neutral";
-               if (contact_allow.indexOf(contacts[name].cid)>-1){contactstatus="positive"}
-               else if (contact_deny.indexOf(contacts[name].cid)>-1){contactstatus="negative"}
-               contactModel.append({"contact":contacts[name],"contactstatus":contactstatus})
-         }},"isFriend",1);
-
-         Helperjs.readData(db,"groups",login.username,function(owngroups){
-            for (var number in owngroups){
-                  var groupstatus= "neutral";
-                  if (group_allow.indexOf(owngroups[number].gid)>-1){groupstatus="positive"}
-                  else if (group_deny.indexOf(owngroups[number].gid)>-1){groupstatus="negative"}
-                   groupModel.append({"group":owngroups[number],"groupstatus":groupstatus})
-         }});
-      }
-}
diff --git a/source-android/qml/newsqml/SmileyDialog.qml b/source-android/qml/newsqml/SmileyDialog.qml
deleted file mode 100644
index 6083755..0000000
--- a/source-android/qml/newsqml/SmileyDialog.qml
+++ /dev/null
@@ -1,242 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.11
-import QtQuick.Controls 2.4
-import QtQuick.Layouts 1.11
-//import QtQuick.Controls.Styles 1.4
-import "qrc:/js/smiley.js" as Smileyjs
-import "qrc:/js/helper.js" as Helperjs
-import "qrc:/qml/genericqml"
-
-Rectangle{
-    id:smileyDialog
-    x: mm
-    width: messageColumn.width-5*mm
-    height:root.height/2
-    
-    Button{
-       id:closeButton
-       height: 6*mm
-       width: 8*mm
-       anchors.top: parent.top
-       anchors.topMargin: 1*mm
-       anchors.right: parent.right
-       anchors.rightMargin: 1*mm
-       text:   "\uf057"
-       onClicked:{smileyDialog.visible=false}
-    }
-
-
-    TabBar {
-      id: smileybar
-      width: parent.width
-      height: 9*mm
-      position:TabBar.Header
-      TabButton {
-          text:qsTr("Unicode")
-          font.pixelSize: 2*mm
-      }
-      TabButton {
-          text:  qsTr("Standard")
-          font.pixelSize: 2*mm
-      }
-      TabButton {
-          text:  qsTr("Addon")
-          font.pixelSize: 2*mm
-      }
-    
-      TabButton {
-          text:  qsTr("Adult")
-          font.pixelSize: 2*mm
-      }
-  }
-
-
-    StackLayout{
-        id:smileyTabView
-        currentIndex: smileybar.currentIndex
-        anchors.top: closeButton.bottom
-        anchors.topMargin: 1*mm
-        width: smileyDialog.width-2*mm
-        height: smileyDialog.height-7*mm
-//        style: TabViewStyle {
-//            frameOverlap: 1
-//            tab: Rectangle {
-//               color: "white"
-//               implicitWidth: smileyTabView.width/4-2*mm
-//               implicitHeight: 4*mm
-//               Text { id: text
-//                  anchors.centerIn: parent
-//                  text: styleData.title
-//                  color: "dark grey"
-//                  font.pixelSize:2.5*mm
-//                  font.bold: styleData.selected
-//               }
-//            }
-//            frame: Rectangle { color: "light grey" }
-//            tabsAlignment:Qt.AlignHCenter
-//         }
-
-           Rectangle{
-               id: htmlGridTab
-               GridView {
-                     id:htmlView
-                     anchors.fill: parent
-                     cellWidth: 5*mm
-                     cellHeight: 5*mm
-                     clip: true
-                     model: htmlModel
-                     delegate: htmlItem
-                }
-
-                ListModel{
-                    id:htmlModel
-                }
-           Component.onCompleted:{
-                   for (var icon in Smileyjs.html){
-                       htmlModel.append({"emoji":Smileyjs.html[icon]})
-                   }
-               }
-           }
-
-        Rectangle{
-            id: coreGridTab
-            GridView {
-                  id: coreSmileyView
-                  anchors.fill: parent
-                  cellWidth: 5*mm
-                  cellHeight: 5*mm
-                  clip: true
-                  model: coreSmileyModel
-                  delegate: smileyItem
-             }
-
-             ListModel{
-                 id: coreSmileyModel
-             }
-
-             Component.onCompleted:{
-                var smileyarray=Smileyjs.core
-                for (var icon in smileyarray){
-                    coreSmileyModel.append({"emoji":smileyarray[icon]})
-                }
-             }
-         }
-
-        Rectangle{
-            id: addonGridTab
-            GridView {
-                  id: addonView
-                  anchors.fill: parent
-                  cellWidth: 5*mm
-                  cellHeight: 5*mm
-                  clip: true
-                  model: addonModel
-                  delegate: smileyItem
-             }
-
-             ListModel{
-                 id: addonModel
-             }
-        Component.onCompleted:{
-                for (var icon in Smileyjs.addon){
-                    addonModel.append({"emoji":Smileyjs.addon[icon]})
-                }
-            }
-        }
-
-
-        Rectangle{
-            id: adultGridTab
-            GridView {
-                  id: adultView
-                  anchors.fill: parent
-                  cellWidth: 5*mm
-                  cellHeight: 5*mm
-                  clip: true
-                  model: adultModel
-                  delegate: smileyItem
-             }
-
-             ListModel{
-                 id: adultModel
-             }
-        Component.onCompleted:{
-                for (var icon in Smileyjs.adult){
-                    adultModel.append({"emoji":Smileyjs.adult[icon]})
-                }
-            }
-        }
-
-      
-
-      
-    }
-    Component{
-         id:smileyItem
-         AnimatedImage{id:smileyImage
-             width:4.5*mm
-             height: 4.5*mm
-             fillMode:Image.PreserveAspectFit
-             source:emoji.url
-          
-            MouseArea{
-                anchors.fill: parent
-                onClicked:{
-                     //bodyField.append(emoji.name+" ")
-                    bodyField.insert(bodyField.cursorPosition,emoji.name+" ");
-                     smileyDialog.visible=false
-                    }
-                }
-            }
-         }
-         
-    Component{
-         id:htmlItem
-        Text{id:smileText
-             width:4.5*mm
-             height: 4.5*mm
-             textFormat:Text.RichText
-             font.pixelSize: 4*mm
-             text: emoji
-          
-            MouseArea{
-                anchors.fill: parent
-                onClicked:{
-                     //bodyField.append(emoji.name+" ")
-                    bodyField.insert(bodyField.cursorPosition,emoji+" ");
-                     smileyDialog.visible=false
-                    }
-                }
-            }
-         }
-    }
diff --git a/source-android/qml/photoqml b/source-android/qml/photoqml
new file mode 120000
index 0000000..4000452
--- /dev/null
+++ b/source-android/qml/photoqml
@@ -0,0 +1 @@
+./../../source-linux/qml/photoqml/
\ No newline at end of file
diff --git a/source-android/qml/photoqml/ImageUploadDialog.qml b/source-android/qml/photoqml/ImageUploadDialog.qml
deleted file mode 100644
index 9302135..0000000
--- a/source-android/qml/photoqml/ImageUploadDialog.qml
+++ /dev/null
@@ -1,306 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.5
-import QtQuick.Controls 2.4
-import "qrc:/js/helper.js" as Helperjs
-import "qrc:/js/image.js" as Imagejs
-import "qrc:/qml/genericqml"
-
-Rectangle{
-    id:imageDialog
-    property var attachImageURLs: []
-    property string imageId: ""
-    property string currentAlbum:""
-    property var contacts: []
-    property var groups: []
-    property var contact_allow:login.permissions[0]
-    property var contact_deny:login.permissions[1]
-    property var group_allow:login.permissions[2]
-    property var group_deny:login.permissions[3]
-    property int imageNo: 0
-
-    function uploadSelectedImage(inumber){
-        xhr.url= login.server + "/api/friendica/photo/create.json";
-        xhr.setLogin(login.username+":"+Qt.atob(login.password));
-        xhr.clearParams();
-        xhr.setParam("desc",imageUploadModel.get(inumber).description);
-        xhr.setParam("album", album.currentText);
-        //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))};
-        xhr.setImageFileParam("media", imageUploadModel.get(inumber).imageUrl );
-        xhr.post();
-     }
-
-
-function updateImage(){
-        xhr.url= login.server + "/api/friendica/photo/update.json";
-        xhr.setLogin(login.username+":"+Qt.atob(login.password));
-        xhr.clearParams();
-        xhr.setParam("desc",imageUploadModel.get(0).description);
-        xhr.setParam("album", currentAlbum);
-        xhr.setParam("album_new", album.currentText);
-        xhr.setParam("photo_id", imageId);
-        xhr.post();
-     }
-
-
-    function attachImage(url){
-            imageUploadModel.append({"imageUrl":url,"description":""})
-        }
-
-    //border.color: "grey"
-    y:1
-    width:root.width-mm
-    height:root.height-5*mm
-    property string directory: ""
-
-    Connections{
-        target:xhr
-        onError:{print(data)}//if (data=="image"){Helperjs.showMessage()}}
-        onSuccess:{
-            if (imageId==""){
-                imageNo=imageNo+1;
-                if(imageNo<imageUploadModel.count){
-                    uploadSelectedImage(imageNo);
-                }else{
-                    Imagejs.requestList(login,db, true,root,function(obj){
-                        fotorectangle.newimages=obj;
-                        imageDialog.destroy()
-                    })
-
-                }} else{
-                Imagejs.updateImage(db,login,"image",filesystem,imageId,root,function(){
-                    Imagejs.requestList(login,db, true,root,function(obj){
-                        fotorectangle.newimages=obj;
-                        fotoSignal(login,"backButton");
-                        //photoStack.pop()
-                    })
-                })
-            }
-        }
-    }
-
-    Row{
-        id:buttonRow
-        anchors.top: parent.top
-        anchors.topMargin: 1*mm
-        anchors.right: parent.right
-        anchors.rightMargin: 1*mm
-        spacing:5*mm
-        Text{
-            font.pixelSize: 3.5*mm
-            font.bold: true
-            text:qsTr("Upload to album")
-        }
-//        BlueButton{
-//            id:permButton
-//            text: ((contact_allow.length==0)&&(contact_deny.length==0)&&(group_allow.length==0)&&(group_deny.length==0))?"\uf09c":"\uf023"
-//            onClicked: {
-//                var component = Qt.createComponent("qrc:/qml/genericqml/PermissionDialog.qml");
-//                var permissions = component.createObject(imageDialog,{"x":mm,"y":40*mm});
-//            }
-//        }
-        
-     Button{
-            id:closeButton
-            height: 8*mm
-            text:   "\uf057"
-            font.pixelSize: 3*mm
-            onClicked:{photoStack.pop();
-                //imageDialog.destroy()
-            }
-        }
-    }
-
-//    Text {
-//      text: qsTr("Album")
-//     x: 4*mm; y: 10*mm
-//    }
-
-//    Text {
-//      text: qsTr("Image")
-//     x: 4*mm; y: 17*mm
-//    }
-
-//    Text {
-//      text: qsTr("Description")
-//     x: 4*mm; y: 33*mm
-//    }
-
-    ListView{
-        id: imageUploadView
-        x:3*mm //23*mm
-        y:17*mm
-        width: imageDialog.width-5*mm //25*mm
-        height: root.width/2 //25*mm
-        model: imageUploadModel
-        delegate: imageDelegate
-        footer: imageId==""?imageFooter:null
-        clip:true
-        orientation: ListView.Horizontal
-        spacing: mm
-    }
-    BusyIndicator{
-      id: uploadBusy
-      running: false
-      anchors.horizontalCenter: imageUploadView.horizontalCenter
-      anchors.top:imageUploadView.top
-      anchors.topMargin: 2*mm
-      width:10*mm
-      height: 10*mm
-    }
-    ListModel{
-        id: imageUploadModel
-    }
-
-    Component{
-        id: imageDelegate
-        Rectangle{
-            width:root.width/2 //Math.max(20*mm,descriptionInput.contentWidth)
-            height:imageUploadView.height-5*mm // 20*mm
-            Image{
-                id: uploadImage
-                width: root.width/2-mm //20*mm
-                height: imageUploadView.height-6*mm//height: 14*mm
-                fillMode: Image.PreserveAspectFit
-                source:imageUrl
-                onVisibleChanged: descriptionInput.focus=true;
-                MouseArea{
-                    anchors.fill: parent
-                    onClicked:{
-                        imageUploadModel.remove(index)
-//                        attachImageURLs.splice(attachImageURLs.indexOf(imageUrl,1))
-//                        attachImage(imageUrl)
-                    }
-                }
-            }
-
-            Rectangle{
-                color: "light grey"
-                border.color: "grey"
-                anchors.top: uploadImage.bottom
-                anchors.topMargin: mm
-                 //x: mm; y: 15*mm;
-                 width: root.width/2-mm  //Math.max(root.width/2-mm, descriptionInput.contentWidth);
-                 height: 5*mm;
-                 TextField{
-                 //TextInput {
-                     id: descriptionInput
-                     anchors.fill: parent
-                     font.pixelSize: 3*mm
-                     selectByMouse: true
-                     placeholderText: qsTr("Description")
-                     text:description!=""?description:""
-                     onTextChanged: imageUploadModel.set(index,{"description":descriptionInput.text});
-                }
-            }
-        }
-    }
-    Component{
-        id: imageFooter
-        Image{
-            id: footerImage
-            height: root.width/4
-            width: root.width/4 //15*mm
-             //15*mm
-            fillMode: Image.PreserveAspectFit
-            source:"qrc:/images/addImage.png"
-            MouseArea{
-                anchors.fill: parent
-                onClicked:{
-                    imagePicking=true;
-                    var imagePicker = Qt.createQmlObject('import QtQuick 2.0; import "qrc:/qml/genericqml";'+
-                    osSettings.imagePickQml+'{multiple : false;onReady: {attachImageURLs.push(imageUrl);'+
-                    'attachImage(imageUrl)}}',imageDialog,"imagePicker");
-                     imagePicker.pickImage()
-                }
-            }
-        }
-    }
-    ComboBox{
-        id: album
-        x: 3*mm
-        y: 10*mm
-        width: root.width/2;
-        height: 5*mm;
-        editable:true
-        model: albumModel
-        onAccepted: {
-            if (find(currentText) === -1) {
-                albumModel.append({text: editText})
-                currentIndex = find(editText)
-            }
-        }
-    }
-
-    ListModel{id:albumModel}
-
-    Button{
-        id:uploadButton
-        height: 8*mm
-        x:4*mm; y:root.width/2+18*mm //40*mm
-        text:   imageId==""?qsTr("Upload"):qsTr("Change")
-        font.pixelSize: 3*mm
-        onClicked:{
-            if(album.currentText==""){Helperjs.showMessage(qsTr("Error"),qsTr(" No album name given"), imageDialog)}
-            else if (imageId!=""){uploadBusy.running=true; updateImage()}
-            else{newimageProgress.visible=true;
-                if (imageUploadModel.count>0){
-                    uploadSelectedImage(0)
-            }}
-        }
-    }
-    ProgressBar{
-        id: newimageProgress
-        width: 15*mm
-        height: buttonRow.height
-        anchors.top: parent.top
-        anchors.right:buttonRow.left
-        anchors.rightMargin:mm
-        visible: false
-        value: imageNo/imageUploadModel.count
-    }
-
-    Component.onCompleted:{
-        albumModel.append({"text":""});
-        try{Helperjs.readField("album",db,"imageData",login.username,function(storedAlbums){
-          for (var n in storedAlbums){
-              albumModel.append({"text":storedAlbums[n]})}
-        })}
-        catch (e){print(e)}
-        if(attachImageURLs.length>0){
-            for (var n in attachImageURLs){attachImage(attachImageURLs[n])}
-        }
-    }
-}
diff --git a/source-android/qml/photoqml/PhotoComponent.qml b/source-android/qml/photoqml/PhotoComponent.qml
deleted file mode 100644
index 0ba343a..0000000
--- a/source-android/qml/photoqml/PhotoComponent.qml
+++ /dev/null
@@ -1,148 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.5
-import QtQuick.Controls 1.2
-import "qrc:/qml/photoqml"
-
-Package {
-   Item { id: stackItem; Package.name: 'stack'; z: stackItem.PathView.z;width:16.5*mm;height:16.5*mm}
-    Item { id: listItem; Package.name: 'list'; width: root.width-1*mm; height: root.height-8*mm; }
-    Item { id: gridItem; Package.name: 'grid';}
-
-    Item {
-      id: photoWrapper
-      width: 16.5*mm; height: 16.5*mm
-      z: stackItem.PathView.z
-      property string hqphotolink: photoLink
-      property string imageId:""
-
-        Rectangle {
-           id: placeHolder
-           color: 'lightblue'; antialiasing: true
-           anchors.fill:parent
-        }
-        BusyIndicator { anchors.centerIn: parent; running: realImage.status != Image.Ready }
-        Image {
-            id: realImage;
-            visible: (albumWrapper.state != '')||(index==0)
-            width: photoWrapper.width; height: photoWrapper.height
-            antialiasing: true;
-            asynchronous: true
-            autoTransform:true
-            cache: false
-            fillMode: Image.PreserveAspectFit;
-            source: (albumWrapper.state == '')&&(index>0)?"":imageLocation
-        }
-        Rectangle{
-            id:phototextRectangle
-            color:"black"
-            z:3
-            opacity: 0.5
-            width:phototext.contentWidth
-            height: phototext.contentHeight
-            anchors.bottom: photoWrapper.bottom
-        }
-        Text {
-            id:phototext
-            z:4
-            text: photoDescription.trim()
-            width:15*mm
-            anchors.bottom: photoWrapper.bottom
-            color: "white"
-            font.pixelSize: 2*mm
-            wrapMode:Text.Wrap
-        }
-        MouseArea {
-            width: realImage.paintedWidth; height: realImage.paintedHeight; anchors.centerIn: realImage
-             onPressAndHold:{
-                 var menuString="import QtQuick 2.5;import QtQuick.Controls 1.4; "+
-                     "Menu {MenuItem {text:qsTr('Delete on client and server'); onTriggered: {"+
-                             "changeimage('delete','image','"+imageLocation+"');photoModel.remove(index)}}"+
-                         "MenuItem {text:qsTr('Move to album'); onTriggered: {"+
-                             "changeimage('update','image','"+imageId+"');}}"+
-                         "}";
-                 var imagemenuObject=Qt.createQmlObject(menuString,photoWrapper,"imagemenuOutput")
-                        imagemenuObject.popup()  
-             }
-             onClicked: {
-                if (albumWrapper.state == 'inGrid') {
-                    gridItem.GridView.view.currentIndex = index;
-                    albumWrapper.state = 'fullscreen';
-                    listItem.ListView.view.currentIndex=index
-                } else {
-                    gridItem.GridView.view.currentIndex = index;
-                    albumWrapper.state = 'inGrid'
-                }
-            }
-        }
-        PinchArea  {
-            id:imagePinch
-            pinch.target: realImage
-            anchors.fill: realImage
-            pinch.minimumScale: 0.1
-            pinch.maximumScale: 10
-            enabled: false
-        }
-
-        // onStateChanged: print("State"+photoWrapper.state+index)
-        states: [
-            State {
-                name: 'stacked'; when: albumWrapper.state == ''
-                ParentChange { target: photoWrapper; parent: stackItem; }//x: 1*mm; y: 1*mm }
-                PropertyChanges { target: photoWrapper; opacity: stackItem.PathView.onPath ? 1.0 : 0.0 }
-                PropertyChanges { target: phototext; opacity: 0.0 }
-                PropertyChanges { target: phototextRectangle; opacity: 0.0 }
-            },
-            State {
-                name: 'inGrid'; when: albumWrapper.state == 'inGrid'
-                ParentChange { target: photoWrapper; parent: gridItem; x: 1*mm; y: 1*mm;}
-                PropertyChanges { target: phototext; opacity: 1.0 }
-                PropertyChanges { target: phototextRectangle; opacity: 0.5 }
-                PropertyChanges { target: placeHolder; opacity: 1.0 }
-            },
-            State {
-                name: 'fullscreen'; when: albumWrapper.state == 'fullscreen'
-                ParentChange {
-                    target: photoWrapper; parent: listItem; x: 1; y: 1;
-                    width: root.width-mm; height: root.height-8*mm
-                }
-                PropertyChanges { target: placeHolder; opacity: 0.0 }
-                PropertyChanges { target: realImage; source: photoWrapper.hqphotolink}
-                PropertyChanges { target: phototext; anchors.bottom: realImage.bottom}
-                PropertyChanges { target: phototext; width:realImage.width }
-                PropertyChanges { target: phototextRectangle; anchors.bottom: realImage.bottom }
-                PropertyChanges { target: imagePinch; enabled:true}
-               // PropertyChanges { target: realImage; width: Math.min(listItem.width,sourceSize.width);height: Math.min(listItem.height,sourceSize.height) }
-            }
-        ]
-    }
-}
diff --git a/source-android/qml/photoqml/PhotoTab.qml b/source-android/qml/photoqml/PhotoTab.qml
deleted file mode 100644
index 7c54269..0000000
--- a/source-android/qml/photoqml/PhotoTab.qml
+++ /dev/null
@@ -1,305 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.5
-import QtQuick.Controls 2.4
-import QtQml.Models 2.1
-import "qrc:/js/image.js" as Imagejs
-import "qrc:/js/helper.js" as Helperjs
-import "qrc:/qml/photoqml"
-import "qrc:/qml/genericqml"
-
-
-StackView{
-    id: photoStack
-    //anchors.fill:parent
-    initialItem:Rectangle {
-    id:fotorectangle
-    anchors.fill:parent
-//    y:1
-//    width:root.width-mm
-//    height:root.height-5*mm
-    color: '#fff'
-    property var newimages:[]
-    property int currentimageno: 0
-    property bool remoteContact: false
-
-
-    onNewimagesChanged:{
-        if(fotorectangle.newimages.length>0){
-            //print("newimages "+JSON.stringify(newimages));
-            var ownimagelist=[];
-            Helperjs.readField("album",root.db,"imageData",root.login.username,function(albums){
-                for (var i=0;i<fotorectangle.newimages.length;i++){
-                    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);
-                }
-            })
-            xhr.setLogin(login.username+":"+Qt.atob(login.password));
-            xhr.setImagedir(login.imagestore);
-            xhr.setFilelist(ownimagelist);
-            xhr.setDownloadtype("picturelist");
-            xhr.getlist();
-            newImagesProgress.visible=true
-        }
-    }
-
-    onCurrentimagenoChanged:{
-        if(fotorectangle.currentimageno==fotorectangle.newimages.length){newImagesProgress.visible=false;showFotos(root.login,"");
-            fotorectangle.newimages=[];fotorectangle.currentimageno=0}
-    // download next image
-    }
-
-    Connections{
-        target:xhr
-        onDownloadedjson:{
-            if(type=="picturelist"){
-                fotorectangle.currentimageno=fotorectangle.currentimageno+1
-                Imagejs.storeImagedata(login,db,jsonObject,fotorectangle)
-            }
-        }
-        onDownloaded:{
-            if(type=="picture"){fotorectangle.currentimageno=fotorectangle.currentimageno+1}
-        }
-        onError:{if(data=="picturelist"){
-                var requestid=url.substring(url.lastIndexOf("=")+1);
-                Imagejs.dataRequest(login,requestid,db,xhr,fotorectangle)
-            } else {fotorectangle.currentimageno=fotorectangle.currentimageno+1}
-        }
-    }
-//    Connections{
-//        target:filesystem
-//        onError:{print("Error deleting");
-//            }
-//        onSuccess:print("Success deleting");
-//    }
-
-    function showFotos(login,friend){
-        if(friend=="backButton"){
-            if (photoStack.depth>1){photoStack.pop()}
-            if(!albumgridview.currentItem){root.currentIndex=0}
-            if(albumgridview.currentItem.state=='fullscreen'){
-                albumgridview.currentItem.state = 'inGrid'}
-            else if (albumgridview.currentItem.state == 'inGrid'){albumgridview.currentItem.state=''}
-            else{root.currentIndex=0}
-        }
-        else{
-            try {photogroupModel.clear()}catch (e){print(e)}
-            if (friend){
-                  Imagejs.newRequestFriendsAlbumPictures(root.login,friend,fotorectangle,function(albums,remoteAuthBool){
-                    remoteContact=remoteAuthBool;
-                    var msg = {'model': photogroupModel,'albums':albums,'firstalbum':0,'foreignPicture':true,'friend':friend}
-                    photoWorker.sendMessage(msg);
-                })
-                phototabstatusButton.text=friend.screen_name+qsTr("\'s images")
-
-            }
-            else {
-                Helperjs.readField("album", root.db, "imageData",login.username,function(albums){
-                    if (albums[0]) {
-                        var msg = { 'model': photogroupModel,'albums':albums,'firstalbum':0,'foreignPicture': false};
-                        photoWorker.sendMessage(msg);
-                    }
-                })
-            }
-        }
-    }
-
-    function deletepics(method, type,id){
-            if(method=="delete"){Imagejs.deleteImage(db,login,type, id,filesystem,root,function(){//showFotos("")
-            })}
-    }
-    function updatepic(method,type,id){
-            if(method=="update"){
-                Helperjs.readData(db,"imageData",login.username,function(url){
-                photoStack.push(
-                    "qrc:/qml/photoqml/ImageUploadDialog.qml",{"attachImageURLs":[url[0].location+url[0].filename],"imageId":id,"currentAlbum":url[0].album}
-                                )
-            },"id",id)}
-    }
-
-    function uploadUrls(urls){
-        photoStack.push("qrc:/qml/photoqml/ImageUploadDialog.qml",{"attachImageURLs":urls})
-    }
-
-    ProgressBar{
-        id: newImagesProgress
-        width: 15*mm
-        height: updatePhotolist.height
-        anchors.top: parent.top
-        anchors.right:uploadPhoto.left
-        anchors.rightMargin:mm
-        visible: false
-        value: fotorectangle.currentimageno/fotorectangle.newimages.length
-    }
-
-    MButton{
-        id:  uploadPhoto
-        anchors.top: parent.top
-        anchors.topMargin: 0.5*mm
-        anchors.right:updatePhotolist.left
-        anchors.rightMargin:mm
-        height: 6*mm
-        width: 8*mm
-        text:"\uf0ee"
-        onClicked: {
-            photoStack.push("qrc:/qml/photoqml/ImageUploadDialog.qml");
-//            var component = Qt.createComponent("qrc:/qml/photoqml/ImageUploadDialog.qml");
-//                     var imageUpload = component.createObject(fotorectangle);
-            }}
-
-    MButton{
-        id:  updatePhotolist
-        anchors.top: parent.top
-        anchors.topMargin: 0.5*mm
-        anchors.right:phototabstatusButton.left
-        anchors.rightMargin:mm
-        height: 6*mm
-        width:  8*mm
-        text:"\uf0ed"
-
-        Menu {
-            id:photoupdatemenu
-            width:40*mm
-            MenuItem {
-                text: qsTr("All Images")
-                font.pixelSize: 3*mm
-                onTriggered: {
-                    Imagejs.requestList(root.login,root.db, false, fotostab,function(obj){fotorectangle.newimages=obj})}
-            }
-            MenuItem {
-                text: qsTr("Only new")
-                font.pixelSize: 3*mm
-                onTriggered: {
-                    Imagejs.requestList(root.login,root.db, true,fotostab,function(obj){fotorectangle.newimages=obj})}
-            }
-        }
-        onClicked: {photoupdatemenu.popup()}
-    }
-
-    MButton{
-        id:  phototabstatusButton
-        anchors.top: parent.top
-        anchors.topMargin: 0.5*mm
-        anchors.right: parent.right
-        anchors.rightMargin:2*mm
-        height: 6*mm
-        width: Math.max(10*mm,implicitWidth)
-        text: fotostab.phototabstatus=="Images"?qsTr("Own Images"):fotostab.phototabstatus
-        Menu {
-            id:phototabmenu
-            width: 40*mm
-            MenuItem {
-                text: qsTr("Own Images")
-                font.pixelSize: 3*mm
-                onTriggered: {
-                    fotostab.phototabstatus="Images";
-                   // phototabstatusButton.text=qsTr("Own images");
-                    showFotos(root.login,"")}
-            }
-        }
-        onClicked: {phototabmenu.popup()}
-    }
-
-
-    DelegateModel{
-        id: visualphotoModel
-        delegate: PhotogroupComponent{}
-        model: photogroupModel
-    }
-
-    ListModel{
-        id: photogroupModel
-    }
-
-    GridView {
-        id: albumgridview
-        cellWidth: 17*mm
-        cellHeight: 17*mm
-        x: mm;y:8*mm
-        width: parent.width-2*mm; height: parent.height-9*mm
-        clip: true
-        model: visualphotoModel.parts.album
-        footer:Rectangle{
-            border.color: "#EEEEEE"
-            border.width: 1
-            width:12*mm
-            height:6*mm
-            Text{
-                font.pixelSize: 1.5*mm
-                anchors.centerIn: parent
-                text:qsTr("More")
-            }
-            MouseArea{anchors.fill:parent
-                onClicked:{print(photogroupModel.get(0).foreignPicture);
-                    var lastalbum_id=photogroupModel.count-1;
-                    if(photogroupModel.get(photogroupModel.count-1).foreignPicture==true){
-                        Imagejs.newRequestFriendsAlbumPictures(login,photogroupModel.get(0).friend,fotorectangle,function(albums,remoteAuthBool){
-                            remoteContact=remoteAuthBool;
-                            var msg = {'model': photogroupModel,'albums':albums,'firstalbum':lastalbum_id+1,'foreignPicture':true,'friend':photogroupModel.get(0).friend}
-                            photoWorker.sendMessage(msg)
-                        })
-                    }
-                    else{Helperjs.readField("album",root.db, "imageData",root.login.username,function(albums){
-                        var msg = { 'model': photogroupModel,'albums':albums,'foreignPicture': false,'firstalbum':lastalbum_id+1};
-                        photoWorker.sendMessage(msg)})}
-        }}}
-    }
-
-    Rectangle { id: photoBackground; color: 'light grey'; width: parent.width; height: parent.height; opacity: 0; visible: opacity != 0.0 }
-
-    ListView { width: parent.width; height:parent.height; model: visualphotoModel.parts.browser; interactive: false }
-
-    MButton {
-        id: backButton
-        height: 6*mm
-        width: 8*mm
-        text: "\uf057"
-        x: parent.width - backButton.width - 3*mm
-        y: -backButton.height - 4*mm
-        z:2
-        onClicked: {photoBackground.opacity=0}
-    }
-
-    ListView {anchors.fill: parent; model: visualphotoModel.parts.fullscreen; interactive: false }
-    WorkerScript{id: photoWorker;source: "qrc:/js/photoworker.js"}
-
-    Component.onCompleted: {
-        root.fotoSignal.connect(showFotos);
-        root.uploadSignal.connect(uploadUrls);
-        root.changeimage.connect(deletepics);
-        root.changeimage.connect(updatepic);
-        if (fotostab.phototabstatus=="Images"){showFotos(root.login,"")}
-    }
- }
-}
diff --git a/source-android/qml/photoqml/PhotogroupComponent.qml b/source-android/qml/photoqml/PhotogroupComponent.qml
deleted file mode 100644
index 0c8ac73..0000000
--- a/source-android/qml/photoqml/PhotogroupComponent.qml
+++ /dev/null
@@ -1,155 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
-//
-//  This program is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  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 QtQuick 2.5
-import QtQuick.Controls 1.3
-import QtQml.Models 2.1
-//import "qrc:/js/service.js" as Service
-import "qrc:/js/image.js" as Imagejs
-import "qrc:/js/helper.js" as Helperjs
-
-Package {
-    Item {
-        Package.name: 'browser'
-        GridView {
-            id: photosGridView; model: visualModel.parts.grid; width: albumgridview.width; height: albumgridview.height;y:albumgridview.y
-            cellWidth: 16.5*mm; cellHeight: 16.5*mm; interactive: false//anchors.margins:2*mm
-            onCurrentIndexChanged: photosListView.positionViewAtIndex(currentIndex, ListView.Contain)
-             }
-         }
-
-    Item {
-        Package.name: 'fullscreen'
-        ListView {
-            id: photosListView; model: visualModel.parts.list; orientation: Qt.Horizontal
-            width: albumgridview.width; height: albumgridview.height; //y:albumgridview.y
-            //width: parent.width; height: parent.height;
-            interactive: false
-            onCurrentIndexChanged: photosGridView.positionViewAtIndex(currentIndex, GridView.Contain)
-            highlightRangeMode: ListView.StrictlyEnforceRange; snapMode: ListView.SnapOneItem
-            }
-         }
-
-    Item {
-        Package.name: 'album'
-        id: albumWrapper; width: 16.5*mm; height: 16.5*mm
-        DelegateModel {
-            id: visualModel; delegate: PhotoComponent { }
-            model: photoModel
-            }
-
-         PathView {
-            id: photosPathView;
-            model: visualModel.parts.stack;
-            pathItemCount: 1
-            anchors.centerIn: parent;
-            path: Path {
-                PathAttribute { name: 'z'; value: 9999.0 }
-                PathLine { x: 1; y: 1 }
-                PathAttribute { name: 'z'; value: 0.0 }
-                }
-            }
-
-         Rectangle{
-           color:"black"
-           opacity: 0.5
-           width:albumtext.contentWidth
-           height: albumtext.contentHeight
-           anchors.bottom: albumWrapper.bottom
-         }
-         Text {
-            id:albumtext
-            text: albumname
-            width:albumWrapper.width-1*mm
-            height: albumtext.contentHeight
-            wrapMode:Text.Wrap
-            color: "white"
-            font.family: "Monospace"
-            font.pixelSize: 2*mm
-            anchors.bottom: albumWrapper.bottom
-            }
-
-        ListModel{
-            id: photoModel
-        }
-
-        Component.onCompleted:{
-            try {photoModel.clear()}catch (e){print(e)}
-            if(foreignPicture){
-                Imagejs.newRequestFriendsPictures(login,albumlink,friend,photoStack.remoteContact,remoteauth,root,function(obj){
-                    if (obj) {
-                        for (var k=0;k<obj.length;k++){
-                            photoModel.append({"imageLocation": obj[k].thumb,"photoDescription":obj[k].name,"photoLink":obj[k].link})
-                        }
-                    }
-            })}
-            else{
-                Helperjs.readData(db,"imageData",root.login.username,function(obj){
-                    if (obj) {
-                        for (var k=0;k<obj.length;k++){
-                            if(typeof(obj[k].desc)=="string" && obj[k].desc!=""){var name=obj[k].desc}else{var name=obj[k].filename}
-                            photoModel.append({"imageLocation": obj[k].location+obj[k].filename,"photoDescription":name,"photoLink":obj[k].location+obj[k].filename,"imageId":obj[k].id})
-                        }
-                    }
-                },"album",albumname)}
-        }
-
-    MouseArea {
-        anchors.fill: parent
-        onPressAndHold:{
-            var menuString="import QtQuick.Controls 1.4; Menu {MenuItem{text:qsTr('Delete on client and server'); onTriggered: {deletepics('album',albumname);photogroupModel.remove(index)}}}";
-            var albummenuObject=Qt.createQmlObject(menuString,albumWrapper,"albummenuOutput")
-            albummenuObject.popup()
-        }
-        onClicked: albumWrapper.state = 'inGrid'
-     }
-
-     states: [
-            State {
-                name: 'inGrid'
-                 PropertyChanges { target: photosGridView; interactive: true }
-                 PropertyChanges { target: photoBackground; opacity: 1 }
-                 PropertyChanges { target: backButton; onClicked: albumWrapper.state = ''; y: 6 }
-                 },
-             State {
-                name: 'fullscreen'; extend: 'inGrid'
-                PropertyChanges { target: photosGridView; interactive: false }
-                PropertyChanges { target: photosListView; interactive: true }
-                PropertyChanges { target: photoBackground; opacity: 1 }
-                PropertyChanges { target: backButton;onClicked:{
-                    albumWrapper.state = 'inGrid'}
-                }
-              }
-              ]
-
-} //album Ende
-} //Package Ende
- //item Ende
diff --git a/source-android/qtquickcontrols2.conf b/source-android/qtquickcontrols2.conf
deleted file mode 100644
index 3222ebf..0000000
--- a/source-android/qtquickcontrols2.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[Controls]
-Style=Material
-
-[Universal]
-Theme=System
-Accent=Red
-
-[Material]
-Theme=Light
-Accent=LightBlue
-Primary=BlueGrey,50
-Background=Grey,50
-Variant=Dense
-
diff --git a/source-android/qtquickcontrols2.conf b/source-android/qtquickcontrols2.conf
new file mode 120000
index 0000000..4fb6470
--- /dev/null
+++ b/source-android/qtquickcontrols2.conf
@@ -0,0 +1 @@
+../source-linux/qtquickcontrols2.conf
\ No newline at end of file
diff --git a/source-android/translations/friendiqa-de.qm b/source-android/translations/friendiqa-de.qm
deleted file mode 100644
index 642a180..0000000
Binary files a/source-android/translations/friendiqa-de.qm and /dev/null differ
diff --git a/source-android/translations/friendiqa-de.ts b/source-android/translations/friendiqa-de.ts
deleted file mode 100644
index 4b790e7..0000000
--- a/source-android/translations/friendiqa-de.ts
+++ /dev/null
@@ -1,1094 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="de">
-<context>
-    <name>AccountPage</name>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="59"/>
-        <location filename="../qml/configqml/AccountPage.qml" line="370"/>
-        <location filename="../qml/configqml/AccountPage.qml" line="393"/>
-        <source>User</source>
-        <translation>Name</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="86"/>
-        <source>Server</source>
-        <translation>Server</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="91"/>
-        <source>Nickname</source>
-        <translation>Kurzname</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="97"/>
-        <source>Password</source>
-        <translation>Passwort</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="102"/>
-        <source>Image dir.</source>
-        <translation>Bildverz.</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="113"/>
-        <source>News as</source>
-        <translation>Anzeige</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="184"/>
-        <location filename="../qml/configqml/AccountPage.qml" line="321"/>
-        <location filename="../qml/configqml/AccountPage.qml" line="345"/>
-        <source>Error</source>
-        <translation>Fehler</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="184"/>
-        <source>Nicknames containing @ symbol currently not supported</source>
-        <translation>Kurznamen mit @ Zeichen werden derzeit nicht unterstützt.</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="304"/>
-        <source>Confirm</source>
-        <translation>Bestätigen</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="310"/>
-        <source>No server given! </source>
-        <translation>Kein Server angegeben!</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="311"/>
-        <source>No nickname given! </source>
-        <translation>Kein Kurzname angegeben!</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="312"/>
-        <source>No password given! </source>
-        <translation>Kein Passwort angegeben!</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="313"/>
-        <source>No image directory given!</source>
-        <translation>Kein Verzeichnis für Bilder angegeben!</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="321"/>
-        <source>Wrong password!</source>
-        <translation>Falsches Passwort!</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="340"/>
-        <source>Success</source>
-        <translation>Bestätigt</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="340"/>
-        <source>Name</source>
-        <translation>Name</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="420"/>
-        <source>Timeline</source>
-        <translation>Chronologisch</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="425"/>
-        <source>Conversations</source>
-        <translation>Unterhaltungen</translation>
-    </message>
-</context>
-<context>
-    <name>CalendarTab</name>
-    <message>
-        <location filename="../qml/calendarqml/CalendarTab.qml" line="109"/>
-        <source>Events</source>
-        <translation>Termine</translation>
-    </message>
-    <message>
-        <location filename="../qml/calendarqml/CalendarTab.qml" line="114"/>
-        <source>Own Calendar</source>
-        <translation>Eigener Kalender</translation>
-    </message>
-</context>
-<context>
-    <name>ConfigPage</name>
-    <message>
-        <location filename="../qml/configqml/ConfigPage.qml" line="66"/>
-        <source>Max. News</source>
-        <translation>Max. Nachr.</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/ConfigPage.qml" line="143"/>
-        <source>Sync</source>
-        <translation>Autom. Aktualisierung</translation>
-    </message>
-</context>
-<context>
-    <name>ConfigTab</name>
-    <message>
-        <source>User</source>
-        <translation type="vanished">Name</translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation type="vanished">Server</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="vanished">Kurzname</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="vanished">Passwort</translation>
-    </message>
-    <message>
-        <source>Image dir.</source>
-        <translation type="vanished">Bildverz.</translation>
-    </message>
-    <message>
-        <source>Max. News</source>
-        <translation type="vanished">Max. Nachr.</translation>
-    </message>
-    <message>
-        <source>News as</source>
-        <translation type="vanished">Anzeige</translation>
-    </message>
-    <message>
-        <source>Interval (0=None)</source>
-        <translation type="vanished">Intervall (0=keins)</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="vanished">Fehler</translation>
-    </message>
-    <message>
-        <source>Nickname not registered at given server!</source>
-        <translation type="vanished">Name auf der Seite nicht registriert!</translation>
-    </message>
-    <message>
-        <source>Confirm</source>
-        <translation type="vanished">Bestätigen</translation>
-    </message>
-    <message>
-        <source>No server given! </source>
-        <translation type="vanished">Kein Server angegeben!</translation>
-    </message>
-    <message>
-        <source>No nickname given! </source>
-        <translation type="vanished">Kein Kurzname angegeben!</translation>
-    </message>
-    <message>
-        <source>Nickname not registered at given server! </source>
-        <translation type="vanished">Name auf der Seite nicht registriert!</translation>
-    </message>
-    <message>
-        <source>No username given! </source>
-        <translation type="vanished">Kein Nutzername angegeben!</translation>
-    </message>
-    <message>
-        <source>Sync Interval (0=None)</source>
-        <translation type="vanished">Akt.-intervall (0=keine)</translation>
-    </message>
-    <message>
-        <source>Nicknames containing @ symbol currently not supported</source>
-        <translation type="vanished">Kurznamen mit @ Zeichen werden derzeit nicht unterstützt.</translation>
-    </message>
-    <message>
-        <source>Min.</source>
-        <translation type="vanished">Min.</translation>
-    </message>
-    <message>
-        <source>No password given! </source>
-        <translation type="vanished">Kein Passwort angegeben!</translation>
-    </message>
-    <message>
-        <source>No image directory given!</source>
-        <translation type="vanished">Kein Verzeichnis für Bilder angegeben!</translation>
-    </message>
-    <message>
-        <source>No maximum news number given!</source>
-        <translation type="vanished">Maximale News-Anzahl nicht angegeben!</translation>
-    </message>
-    <message>
-        <source>Wrong password!</source>
-        <translation type="vanished">Falsches Passwort!</translation>
-    </message>
-    <message>
-        <source>Success</source>
-        <translation type="vanished">Bestätigt</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="vanished">Name</translation>
-    </message>
-    <message>
-        <source>Timeline</source>
-        <translation type="vanished">Chronologisch</translation>
-    </message>
-    <message>
-        <source>Conversations</source>
-        <translation type="vanished">Unterhaltungen</translation>
-    </message>
-</context>
-<context>
-    <name>ContactComponent</name>
-    <message>
-        <location filename="../qml/contactqml/ContactComponent.qml" line="41"/>
-        <source>Connect</source>
-        <translation>Kontaktanfrage</translation>
-    </message>
-</context>
-<context>
-    <name>ContactDetailsComponent</name>
-    <message>
-        <location filename="../qml/contactqml/ContactDetailsComponent.qml" line="42"/>
-        <source>Connect</source>
-        <translation>Kontaktanfrage</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ContactDetailsComponent.qml" line="94"/>
-        <source>Description</source>
-        <translation>Beschreibung</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ContactDetailsComponent.qml" line="94"/>
-        <source>Location</source>
-        <translation>Ort</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ContactDetailsComponent.qml" line="94"/>
-        <source>Posts</source>
-        <translation>Beiträge</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ContactDetailsComponent.qml" line="95"/>
-        <source>URL</source>
-        <translation>Profilseite</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ContactDetailsComponent.qml" line="96"/>
-        <source>Created at</source>
-        <translation>Erstellt</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPage</name>
-    <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="72"/>
-        <source>Connect</source>
-        <translation>Kontaktanfrage</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="164"/>
-        <source>Description</source>
-        <translation>Beschreibung</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="164"/>
-        <source>Location</source>
-        <translation>Ort</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="164"/>
-        <source>Posts</source>
-        <translation>Beiträge</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="165"/>
-        <source>URL</source>
-        <translation>Profilseite</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="166"/>
-        <source>Created at</source>
-        <translation>Erstellt</translation>
-    </message>
-</context>
-<context>
-    <name>FriendsTab</name>
-    <message>
-        <location filename="../qml/contactqml/FriendsTab.qml" line="80"/>
-        <source>Me</source>
-        <translation>Ich</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/FriendsTab.qml" line="84"/>
-        <source>Friends</source>
-        <translation>Freunde</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/FriendsTab.qml" line="88"/>
-        <source>Contacts</source>
-        <translation>Kontakte</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/FriendsTab.qml" line="92"/>
-        <source>Groups</source>
-        <translation>Gruppen</translation>
-    </message>
-</context>
-<context>
-    <name>GroupComponent</name>
-    <message>
-        <source>Error</source>
-        <translation type="vanished">Fehler</translation>
-    </message>
-    <message>
-        <source>No name given</source>
-        <translation type="vanished">Kein Name angegeben</translation>
-    </message>
-</context>
-<context>
-    <name>ImageUploadDialog</name>
-    <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="124"/>
-        <source>Upload to album</source>
-        <translation>In Album hochladen</translation>
-    </message>
-    <message>
-        <source>Album</source>
-        <translation type="vanished">Album</translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="vanished">Bild</translation>
-    </message>
-    <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="223"/>
-        <source>Description</source>
-        <translation>Beschreibung</translation>
-    </message>
-    <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="273"/>
-        <source>Upload</source>
-        <translation>Hochladen</translation>
-    </message>
-    <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="273"/>
-        <source>Change</source>
-        <translation>Ändern</translation>
-    </message>
-    <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="276"/>
-        <source>Error</source>
-        <translation>Fehler</translation>
-    </message>
-    <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="276"/>
-        <source> No album name given</source>
-        <translation>Kein Albumname angegeben</translation>
-    </message>
-</context>
-<context>
-    <name>MessageSend</name>
-    <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="72"/>
-        <location filename="../qml/newsqml/MessageSend.qml" line="141"/>
-        <location filename="../qml/newsqml/MessageSend.qml" line="146"/>
-        <location filename="../qml/newsqml/MessageSend.qml" line="188"/>
-        <source>to:</source>
-        <translation>an:</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="200"/>
-        <source>Title (optional)</source>
-        <translation>Überschrift (optional)</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="222"/>
-        <source>What&apos;s on your mind?</source>
-        <translation>Woran denkst du gerade?</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="319"/>
-        <location filename="../qml/newsqml/MessageSend.qml" line="367"/>
-        <source>Error</source>
-        <translation>Fehler</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="319"/>
-        <source>Only one attachment supported at the moment.
- Remove other attachment first!</source>
-        <translation>Nur ein Anhang derzeit unterstützt.
- Lösche zuerst den anderen Anhang!</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="367"/>
-        <source>No receiver supplied!</source>
-        <translation>Kein Empfänger angegeben!</translation>
-    </message>
-</context>
-<context>
-    <name>NewsStack</name>
-    <message>
-        <location filename="../qml/newsqml/NewsStack.qml" line="158"/>
-        <source>Network Error</source>
-        <translation>Netzwerk-Fehler</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/NewsStack.qml" line="376"/>
-        <source>More</source>
-        <translation>Mehr</translation>
-    </message>
-</context>
-<context>
-    <name>NewsTab</name>
-    <message>
-        <source>Download profile image for </source>
-        <translation type="vanished">Lade Profilbild für </translation>
-    </message>
-    <message>
-        <source>More</source>
-        <translation type="vanished">Mehr</translation>
-    </message>
-    <message>
-        <source>Timeline</source>
-        <translation type="vanished">Chronologisch</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="vanished">Fehler</translation>
-    </message>
-    <message>
-        <source>Favorites</source>
-        <translation type="vanished">Markierte News</translation>
-    </message>
-    <message>
-        <source>Conversations</source>
-        <translation type="vanished">Unterhaltungen</translation>
-    </message>
-    <message>
-        <source>Network Error</source>
-        <translation type="vanished">Netzwerk-Fehler</translation>
-    </message>
-    <message>
-        <source>Replies</source>
-        <translation type="vanished">Interaktionen</translation>
-    </message>
-    <message>
-        <source>Public timeline</source>
-        <translation type="vanished">Gemeinschaft</translation>
-    </message>
-    <message>
-        <source>Direct Messages</source>
-        <translation type="vanished">Direktnachrichten</translation>
-    </message>
-    <message>
-        <source>Notifications</source>
-        <translation type="vanished">Meldungen</translation>
-    </message>
-    <message>
-        <source>Group news</source>
-        <translation type="vanished">News Gruppe</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="vanished">Schliessen</translation>
-    </message>
-</context>
-<context>
-    <name>Newsitem</name>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="47"/>
-        <source>attending: </source>
-        <translation>Teilnahme</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="105"/>
-        <source>Source: </source>
-        <translation>Quelle: </translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="105"/>
-        <source>Direct Message</source>
-        <translation>Direktnachricht</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="121"/>
-        <source>In reply to </source>
-        <translation>Antwort an </translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="133"/>
-        <source> comments</source>
-        <translation> Kommentare</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="282"/>
-        <source>Attending: </source>
-        <translation>Teilnahme: </translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="411"/>
-        <source>Reply</source>
-        <translation>Antworten</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="420"/>
-        <source>DM</source>
-        <translation>Direktnachricht</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="426"/>
-        <source>Repost</source>
-        <translation>Teilen</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="429"/>
-        <source>Success!</source>
-        <translation>Erledigt!</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="434"/>
-        <source>Conversation</source>
-        <translation>Unterhaltung</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="444"/>
-        <source>Attending</source>
-        <translation>Teilnahme</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="453"/>
-        <source>yes</source>
-        <translation>ja</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="458"/>
-        <source>maybe</source>
-        <translation>vielleicht</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="463"/>
-        <source>no</source>
-        <translation>nein</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="470"/>
-        <source>Delete</source>
-        <translation>Löschen</translation>
-    </message>
-</context>
-<context>
-    <name>PermissionDialog</name>
-    <message>
-        <location filename="../qml/genericqml/PermissionDialog.qml" line="66"/>
-        <source>Friends</source>
-        <translation>Freunde</translation>
-    </message>
-    <message>
-        <location filename="../qml/genericqml/PermissionDialog.qml" line="127"/>
-        <source>Groups</source>
-        <translation>Gruppen</translation>
-    </message>
-</context>
-<context>
-    <name>PhotoTab</name>
-    <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="124"/>
-        <source>&apos;s images</source>
-        <translation>s Bilder</translation>
-    </message>
-    <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="195"/>
-        <source>All Images</source>
-        <translation>Alle Bilder</translation>
-    </message>
-    <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="201"/>
-        <source>Only new</source>
-        <translation>Nur neue</translation>
-    </message>
-    <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="218"/>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="223"/>
-        <source>Own Images</source>
-        <translation>Eigene Bilder</translation>
-    </message>
-    <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="261"/>
-        <source>More</source>
-        <translation>Mehr</translation>
-    </message>
-</context>
-<context>
-    <name>ProfileComponent</name>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="61"/>
-        <source>profile name</source>
-        <translation>Profilname</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="62"/>
-        <source>is default</source>
-        <translation>Hauptprofil</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="63"/>
-        <source>hide friends</source>
-        <translation>Verberge Freunde</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="64"/>
-        <source>profile photo</source>
-        <translation>Profilbild</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="65"/>
-        <source>profile thumb</source>
-        <translation>Mini-Profilbild</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="66"/>
-        <source>publish</source>
-        <translation>öffentlich</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="67"/>
-        <source>publish in network</source>
-        <translation>Öffentlich im Netzwerk</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="68"/>
-        <source>description</source>
-        <translation>Beschreibung</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="69"/>
-        <source>date of birth</source>
-        <translation>Geburtstag</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="70"/>
-        <source>address</source>
-        <translation>Adresse</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="71"/>
-        <source>city</source>
-        <translation>Stadt</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="72"/>
-        <source>region</source>
-        <translation>Region</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="73"/>
-        <source>postal code</source>
-        <translation>Postleitzahl</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="74"/>
-        <source>country</source>
-        <translation>Land</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="75"/>
-        <source>hometown</source>
-        <translation>Heimatstadt</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="76"/>
-        <source>gender</source>
-        <translation>Geschlecht</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="77"/>
-        <source>marital status</source>
-        <translation>Beziehungsstatus</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="78"/>
-        <source>married with</source>
-        <translation>verheiratet mit</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="79"/>
-        <source>married since</source>
-        <translation>verheiratet seit</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="80"/>
-        <source>sexual</source>
-        <translation>Sex</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="81"/>
-        <source>politics</source>
-        <translation>Politik</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="82"/>
-        <source>religion</source>
-        <translation>Religion</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="83"/>
-        <source>public keywords</source>
-        <translation>öffentliche Schlagwörter</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="84"/>
-        <source>private keywords</source>
-        <translation>private Schlagwörter</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="85"/>
-        <source>likes</source>
-        <translation>Vorlieben</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="86"/>
-        <source>dislikes</source>
-        <translation>Abneigungen</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="87"/>
-        <source>about</source>
-        <translation>über</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="88"/>
-        <source>music</source>
-        <translation>Musik</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="89"/>
-        <source>book</source>
-        <translation>Bücher</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="90"/>
-        <source>tv</source>
-        <translation>TV</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="91"/>
-        <source>film</source>
-        <translation>Filme</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="92"/>
-        <source>interest</source>
-        <translation>Interessen</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="93"/>
-        <source>romance</source>
-        <translation>Liebschaften</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="94"/>
-        <source>work</source>
-        <translation>Arbeit</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="95"/>
-        <source>education</source>
-        <translation>Bildung</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="96"/>
-        <source>social networks</source>
-        <translation>Soziale Netzwerke</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="97"/>
-        <source>homepage</source>
-        <translation>Homepage</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="183"/>
-        <source>Update</source>
-        <translation>Aktualisieren</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="216"/>
-        <source>profile id</source>
-        <translation>Profil-Nummer</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="240"/>
-        <source>Description</source>
-        <translation>Beschreibung</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="240"/>
-        <source>Location</source>
-        <translation>Ort</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="240"/>
-        <source>Posts</source>
-        <translation>Beiträge</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="241"/>
-        <source>URL</source>
-        <translation>Profilseite</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="242"/>
-        <source>Created at</source>
-        <translation>Erstellt</translation>
-    </message>
-</context>
-<context>
-    <name>SmileyDialog</name>
-    <message>
-        <location filename="../qml/newsqml/SmileyDialog.qml" line="65"/>
-        <source>Unicode</source>
-        <translation>Unicode</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/SmileyDialog.qml" line="69"/>
-        <source>Standard</source>
-        <translation>Standard</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/SmileyDialog.qml" line="73"/>
-        <source>Addon</source>
-        <translation>Addon</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/SmileyDialog.qml" line="78"/>
-        <source>Adult</source>
-        <translation>XXX</translation>
-    </message>
-</context>
-<context>
-    <name>SyncComponent</name>
-    <message>
-        <location filename="../qml/configqml/SyncComponent.qml" line="56"/>
-        <source>sync</source>
-        <translation>akt.</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/SyncComponent.qml" line="75"/>
-        <source>notify</source>
-        <translation>benachr.</translation>
-    </message>
-</context>
-<context>
-    <name>SyncConfig</name>
-    <message>
-        <location filename="../qml/configqml/SyncConfig.qml" line="42"/>
-        <source>Sync Interval (0=None)</source>
-        <translation>Akt.-intervall (0=keine)</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/SyncConfig.qml" line="75"/>
-        <source>Min.</source>
-        <translation>Min.</translation>
-    </message>
-</context>
-<context>
-    <name>friendiqa</name>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="161"/>
-        <source>Refresh</source>
-        <translation>Aktualisieren</translation>
-    </message>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="179"/>
-        <source>Timeline</source>
-        <translation>Chronologisch</translation>
-    </message>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="192"/>
-        <source>Conversations</source>
-        <translation>Unterhaltungen</translation>
-    </message>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="205"/>
-        <source>Favorites</source>
-        <translation>Markierte News</translation>
-    </message>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="217"/>
-        <source>Replies</source>
-        <translation>Interaktionen</translation>
-    </message>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="231"/>
-        <source>Public Timeline</source>
-        <translation>öff. Timeline</translation>
-    </message>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="244"/>
-        <source>Group news</source>
-        <translation>News Gruppe</translation>
-    </message>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="257"/>
-        <source>Search</source>
-        <translation>Suche</translation>
-    </message>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="270"/>
-        <source>Settings</source>
-        <translation>Einstellungen</translation>
-    </message>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="281"/>
-        <source>Accounts</source>
-        <translation>Konten</translation>
-    </message>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="294"/>
-        <source>Quit</source>
-        <translation>Schliessen</translation>
-    </message>
-</context>
-<context>
-    <name>newsworker</name>
-    <message>
-        <location filename="../js/newsworker.js" line="66"/>
-        <source>likes this.</source>
-        <translation>mag das.</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="67"/>
-        <source>like this.</source>
-        <translation>mögen das.</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="70"/>
-        <source>doesn&apos;t like this.</source>
-        <translation>mag das nicht.</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="71"/>
-        <source>don&apos;t like this.</source>
-        <translation>mögen das nicht.</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="74"/>
-        <source>will attend.</source>
-        <translation>nehmen teil.</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="75"/>
-        <source>persons will attend.</source>
-        <translation>Personen nehmen teil.</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="78"/>
-        <source>will not attend.</source>
-        <translation>nimmt nicht teil.</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="79"/>
-        <source>persons will not attend.</source>
-        <translation>Personen nehmen nicht teil.</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="82"/>
-        <source>may attend.</source>
-        <translation>nimmt vielleicht teil.</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="83"/>
-        <source>persons may attend.</source>
-        <translation>Personen nehmen vielleicht teil.</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="87"/>
-        <source>yes</source>
-        <translation>ja</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="88"/>
-        <source>no</source>
-        <translation>nein</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="89"/>
-        <source>maybe</source>
-        <translation>vielleicht</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="174"/>
-        <source>seconds</source>
-        <translation>Sekunden</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="174"/>
-        <location filename="../js/newsworker.js" line="175"/>
-        <location filename="../js/newsworker.js" line="176"/>
-        <location filename="../js/newsworker.js" line="177"/>
-        <location filename="../js/newsworker.js" line="178"/>
-        <location filename="../js/newsworker.js" line="179"/>
-        <location filename="../js/newsworker.js" line="180"/>
-        <location filename="../js/newsworker.js" line="181"/>
-        <location filename="../js/newsworker.js" line="182"/>
-        <location filename="../js/newsworker.js" line="183"/>
-        <source>ago</source>
-        <translation>her</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="175"/>
-        <source>minute</source>
-        <translation>Minute</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="176"/>
-        <source>minutes</source>
-        <translation>Minuten</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="177"/>
-        <source>hour</source>
-        <translation>Stunde</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="178"/>
-        <source>hours</source>
-        <translation>Stunden</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="179"/>
-        <source>day</source>
-        <translation>Tag</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="180"/>
-        <source>days</source>
-        <translation>Tage</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="181"/>
-        <source>month</source>
-        <translation>Monat</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="182"/>
-        <source>months</source>
-        <translation>Monate</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="183"/>
-        <source>years</source>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>service</name>
-    <message>
-        <source>Error</source>
-        <translation type="vanished">Fehler</translation>
-    </message>
-    <message>
-        <location filename="../js/service.js" line="391"/>
-        <source>Undefined Array Error</source>
-        <translation>Antwort-Array ungültig</translation>
-    </message>
-    <message>
-        <location filename="../js/service.js" line="394"/>
-        <source>JSON status Error</source>
-        <translation>Server-Antwort: Fehler</translation>
-    </message>
-</context>
-</TS>
diff --git a/source-android/translations/friendiqa-es.qm b/source-android/translations/friendiqa-es.qm
deleted file mode 100644
index 8408157..0000000
Binary files a/source-android/translations/friendiqa-es.qm and /dev/null differ
diff --git a/source-android/translations/friendiqa-es.ts b/source-android/translations/friendiqa-es.ts
deleted file mode 100644
index 89d0223..0000000
--- a/source-android/translations/friendiqa-es.ts
+++ /dev/null
@@ -1,1063 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="es">
-<context>
-    <name>AccountPage</name>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="59"/>
-        <location filename="../qml/configqml/AccountPage.qml" line="370"/>
-        <location filename="../qml/configqml/AccountPage.qml" line="393"/>
-        <source>User</source>
-        <translation>Usuario</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="86"/>
-        <source>Server</source>
-        <translation>Servidor</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="91"/>
-        <source>Nickname</source>
-        <translation>Usuario</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="97"/>
-        <source>Password</source>
-        <translation>Contraseña</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="102"/>
-        <source>Image dir.</source>
-        <translation>Dir. de imágenes</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="113"/>
-        <source>News as</source>
-        <translation>Noticias como</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="184"/>
-        <location filename="../qml/configqml/AccountPage.qml" line="321"/>
-        <location filename="../qml/configqml/AccountPage.qml" line="345"/>
-        <source>Error</source>
-        <translation>Error</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="184"/>
-        <source>Nicknames containing @ symbol currently not supported</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="304"/>
-        <source>Confirm</source>
-        <translation>Confirmar</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="310"/>
-        <source>No server given! </source>
-        <translation>¡Servidor no encontrado!</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="311"/>
-        <source>No nickname given! </source>
-        <translation>¡Usuario incorrecto!</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="312"/>
-        <source>No password given! </source>
-        <translation>¡Contraseña incorrecta!</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="313"/>
-        <source>No image directory given!</source>
-        <translation>¡No se ha encontrado el directorio de imágenes!</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="321"/>
-        <source>Wrong password!</source>
-        <translation>¡Contraseña incorrecta!</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="340"/>
-        <source>Success</source>
-        <translation>éxito!</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="340"/>
-        <source>Name</source>
-        <translation>Nombre</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="420"/>
-        <source>Timeline</source>
-        <translation>Cronología</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="425"/>
-        <source>Conversations</source>
-        <translation>Conversaciones</translation>
-    </message>
-</context>
-<context>
-    <name>CalendarTab</name>
-    <message>
-        <location filename="../qml/calendarqml/CalendarTab.qml" line="109"/>
-        <source>Events</source>
-        <translation>Eventos</translation>
-    </message>
-    <message>
-        <location filename="../qml/calendarqml/CalendarTab.qml" line="114"/>
-        <source>Own Calendar</source>
-        <translation>Calendario propio</translation>
-    </message>
-</context>
-<context>
-    <name>ConfigPage</name>
-    <message>
-        <location filename="../qml/configqml/ConfigPage.qml" line="66"/>
-        <source>Max. News</source>
-        <translation>Nº Max. de noticias.</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/ConfigPage.qml" line="143"/>
-        <source>Sync</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ConfigTab</name>
-    <message>
-        <source>User</source>
-        <translation type="vanished">Usuario</translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation type="vanished">Servidor</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="vanished">Usuario</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="vanished">Contraseña</translation>
-    </message>
-    <message>
-        <source>Image dir.</source>
-        <translation type="vanished">Dir. de imágenes</translation>
-    </message>
-    <message>
-        <source>Max. News</source>
-        <translation type="vanished">Nº Max. de noticias.</translation>
-    </message>
-    <message>
-        <source>News as</source>
-        <translation type="vanished">Noticias como</translation>
-    </message>
-    <message>
-        <source>Interval (0=None)</source>
-        <translation type="vanished">Intervalo (0=ningún)</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="vanished">Error</translation>
-    </message>
-    <message>
-        <source>Confirm</source>
-        <translation type="vanished">Confirmar</translation>
-    </message>
-    <message>
-        <source>No server given! </source>
-        <translation type="vanished">¡Servidor no encontrado!</translation>
-    </message>
-    <message>
-        <source>No nickname given! </source>
-        <translation type="vanished">¡Usuario incorrecto!</translation>
-    </message>
-    <message>
-        <source>Nickname not registered at given server! </source>
-        <translation type="vanished">¡Usuario incorrecto!</translation>
-    </message>
-    <message>
-        <source>No username given! </source>
-        <translation type="vanished">¡Usuario incorrecto!</translation>
-    </message>
-    <message>
-        <source>No password given! </source>
-        <translation type="vanished">¡Contraseña incorrecta!</translation>
-    </message>
-    <message>
-        <source>No image directory given!</source>
-        <translation type="vanished">¡No se ha encontrado el directorio de imágenes!</translation>
-    </message>
-    <message>
-        <source>No maximum news number given!</source>
-        <translation type="vanished">¡Nº máximo de noticias incorrecto!</translation>
-    </message>
-    <message>
-        <source>Wrong password!</source>
-        <translation type="vanished">¡Contraseña incorrecta!</translation>
-    </message>
-    <message>
-        <source>Success</source>
-        <translation type="vanished">éxito!</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="vanished">Nombre</translation>
-    </message>
-    <message>
-        <source>Timeline</source>
-        <translation type="vanished">Cronología</translation>
-    </message>
-    <message>
-        <source>Conversations</source>
-        <translation type="vanished">Conversaciones</translation>
-    </message>
-</context>
-<context>
-    <name>ContactComponent</name>
-    <message>
-        <location filename="../qml/contactqml/ContactComponent.qml" line="41"/>
-        <source>Connect</source>
-        <translation>Conectar</translation>
-    </message>
-</context>
-<context>
-    <name>ContactDetailsComponent</name>
-    <message>
-        <location filename="../qml/contactqml/ContactDetailsComponent.qml" line="42"/>
-        <source>Connect</source>
-        <translation>Conectar</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ContactDetailsComponent.qml" line="94"/>
-        <source>Description</source>
-        <translation>Descripción</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ContactDetailsComponent.qml" line="94"/>
-        <source>Location</source>
-        <translation>Localización</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ContactDetailsComponent.qml" line="94"/>
-        <source>Posts</source>
-        <translation>Mensajes</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ContactDetailsComponent.qml" line="95"/>
-        <source>URL</source>
-        <translation>URL</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ContactDetailsComponent.qml" line="96"/>
-        <source>Created at</source>
-        <translation>Creado en</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPage</name>
-    <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="72"/>
-        <source>Connect</source>
-        <translation>Conectar</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="164"/>
-        <source>Description</source>
-        <translation>Descripción</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="164"/>
-        <source>Location</source>
-        <translation>Localización</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="164"/>
-        <source>Posts</source>
-        <translation>Mensajes</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="165"/>
-        <source>URL</source>
-        <translation>URL</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="166"/>
-        <source>Created at</source>
-        <translation>Creado en</translation>
-    </message>
-</context>
-<context>
-    <name>FriendsTab</name>
-    <message>
-        <location filename="../qml/contactqml/FriendsTab.qml" line="80"/>
-        <source>Me</source>
-        <translation>Yo</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/FriendsTab.qml" line="84"/>
-        <source>Friends</source>
-        <translation>Amigos</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/FriendsTab.qml" line="88"/>
-        <source>Contacts</source>
-        <translation>Contactos</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/FriendsTab.qml" line="92"/>
-        <source>Groups</source>
-        <translation>Grupos</translation>
-    </message>
-</context>
-<context>
-    <name>ImageUploadDialog</name>
-    <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="124"/>
-        <source>Upload to album</source>
-        <translation>Subir álbum</translation>
-    </message>
-    <message>
-        <source>Album</source>
-        <translation type="vanished">álbum</translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="vanished">imagen</translation>
-    </message>
-    <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="223"/>
-        <source>Description</source>
-        <translation>Descripción</translation>
-    </message>
-    <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="273"/>
-        <source>Upload</source>
-        <translation>Subir</translation>
-    </message>
-    <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="273"/>
-        <source>Change</source>
-        <translation>Cambiar</translation>
-    </message>
-    <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="276"/>
-        <source>Error</source>
-        <translation>Error</translation>
-    </message>
-    <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="276"/>
-        <source> No album name given</source>
-        <translation>¡Nombre del álbum no encontrado!</translation>
-    </message>
-</context>
-<context>
-    <name>MessageSend</name>
-    <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="72"/>
-        <location filename="../qml/newsqml/MessageSend.qml" line="141"/>
-        <location filename="../qml/newsqml/MessageSend.qml" line="146"/>
-        <location filename="../qml/newsqml/MessageSend.qml" line="188"/>
-        <source>to:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="200"/>
-        <source>Title (optional)</source>
-        <translation>Título (opcional)</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="222"/>
-        <source>What&apos;s on your mind?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="319"/>
-        <location filename="../qml/newsqml/MessageSend.qml" line="367"/>
-        <source>Error</source>
-        <translation>Error</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="319"/>
-        <source>Only one attachment supported at the moment.
- Remove other attachment first!</source>
-        <translation>Solo se admite adjuntar un solo archivo en este momento.
- ¡Elimine y deje un archivo adjunto!</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="367"/>
-        <source>No receiver supplied!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NewsStack</name>
-    <message>
-        <location filename="../qml/newsqml/NewsStack.qml" line="158"/>
-        <source>Network Error</source>
-        <translation>Fallo de red</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/NewsStack.qml" line="376"/>
-        <source>More</source>
-        <translation>Mas</translation>
-    </message>
-</context>
-<context>
-    <name>NewsTab</name>
-    <message>
-        <source>Download profile image for </source>
-        <translation type="vanished">Descargar la imagen del perfil para </translation>
-    </message>
-    <message>
-        <source>More</source>
-        <translation type="vanished">Mas</translation>
-    </message>
-    <message>
-        <source>Timeline</source>
-        <translation type="vanished">Cronología</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="obsolete">Error</translation>
-    </message>
-    <message>
-        <source>Favorites</source>
-        <translation type="vanished">Favoritos</translation>
-    </message>
-    <message>
-        <source>Conversations</source>
-        <translation type="vanished">Conversaciones</translation>
-    </message>
-    <message>
-        <source>Network Error</source>
-        <translation type="vanished">Fallo de red</translation>
-    </message>
-    <message>
-        <source>Public timeline</source>
-        <translation type="vanished">Cronología pública</translation>
-    </message>
-    <message>
-        <source>Direct Messages</source>
-        <translation type="vanished">Mensaje directo</translation>
-    </message>
-    <message>
-        <source>Notifications</source>
-        <translation type="vanished">Notificaciones</translation>
-    </message>
-    <message>
-        <source>Group news</source>
-        <translation type="vanished">Grupos</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="vanished">Salida</translation>
-    </message>
-</context>
-<context>
-    <name>Newsitem</name>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="47"/>
-        <source>attending: </source>
-        <translation>Asistiendo: </translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="105"/>
-        <source>Source: </source>
-        <translation>Fuente: </translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="105"/>
-        <source>Direct Message</source>
-        <translation>Mensaje directo</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="121"/>
-        <source>In reply to </source>
-        <translation>En respuesta a </translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="133"/>
-        <source> comments</source>
-        <translation> comentarios</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="282"/>
-        <source>Attending: </source>
-        <translation>Asistiendo: </translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="411"/>
-        <source>Reply</source>
-        <translation>Respuesta</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="420"/>
-        <source>DM</source>
-        <translation>Mensaje directo</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="426"/>
-        <source>Repost</source>
-        <translation>Volver a publicar</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="429"/>
-        <source>Success!</source>
-        <translation>éxito!</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="434"/>
-        <source>Conversation</source>
-        <translation>Conversación</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="444"/>
-        <source>Attending</source>
-        <translation>Asistiendo</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="453"/>
-        <source>yes</source>
-        <translation>si</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="458"/>
-        <source>maybe</source>
-        <translation>quizás</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="463"/>
-        <source>no</source>
-        <translation>no</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="470"/>
-        <source>Delete</source>
-        <translation>Borrar</translation>
-    </message>
-</context>
-<context>
-    <name>PermissionDialog</name>
-    <message>
-        <location filename="../qml/genericqml/PermissionDialog.qml" line="66"/>
-        <source>Friends</source>
-        <translation>Amigos</translation>
-    </message>
-    <message>
-        <location filename="../qml/genericqml/PermissionDialog.qml" line="127"/>
-        <source>Groups</source>
-        <translation>Grupos</translation>
-    </message>
-</context>
-<context>
-    <name>PhotoTab</name>
-    <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="124"/>
-        <source>&apos;s images</source>
-        <translation>s Imágenes</translation>
-    </message>
-    <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="195"/>
-        <source>All Images</source>
-        <translation>Todas las imagenes</translation>
-    </message>
-    <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="201"/>
-        <source>Only new</source>
-        <translation>Solo nueva</translation>
-    </message>
-    <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="218"/>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="223"/>
-        <source>Own Images</source>
-        <translation>Mis imágenes</translation>
-    </message>
-    <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="261"/>
-        <source>More</source>
-        <translation>Mas</translation>
-    </message>
-</context>
-<context>
-    <name>ProfileComponent</name>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="61"/>
-        <source>profile name</source>
-        <translation>Nombre de perfil</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="62"/>
-        <source>is default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="63"/>
-        <source>hide friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="64"/>
-        <source>profile photo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="65"/>
-        <source>profile thumb</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="66"/>
-        <source>publish</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="67"/>
-        <source>publish in network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="68"/>
-        <source>description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="69"/>
-        <source>date of birth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="70"/>
-        <source>address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="71"/>
-        <source>city</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="72"/>
-        <source>region</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="73"/>
-        <source>postal code</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="74"/>
-        <source>country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="75"/>
-        <source>hometown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="76"/>
-        <source>gender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="77"/>
-        <source>marital status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="78"/>
-        <source>married with</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="79"/>
-        <source>married since</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="80"/>
-        <source>sexual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="81"/>
-        <source>politics</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="82"/>
-        <source>religion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="83"/>
-        <source>public keywords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="84"/>
-        <source>private keywords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="85"/>
-        <source>likes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="86"/>
-        <source>dislikes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="87"/>
-        <source>about</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="88"/>
-        <source>music</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="89"/>
-        <source>book</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="90"/>
-        <source>tv</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="91"/>
-        <source>film</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="92"/>
-        <source>interest</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="93"/>
-        <source>romance</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="94"/>
-        <source>work</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="95"/>
-        <source>education</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="96"/>
-        <source>social networks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="97"/>
-        <source>homepage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="183"/>
-        <source>Update</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="216"/>
-        <source>profile id</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="240"/>
-        <source>Description</source>
-        <translation>Descripción</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="240"/>
-        <source>Location</source>
-        <translation>Localización</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="240"/>
-        <source>Posts</source>
-        <translation>Mensajes</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="241"/>
-        <source>URL</source>
-        <translation>URL</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="242"/>
-        <source>Created at</source>
-        <translation>Creado en</translation>
-    </message>
-</context>
-<context>
-    <name>SmileyDialog</name>
-    <message>
-        <location filename="../qml/newsqml/SmileyDialog.qml" line="65"/>
-        <source>Unicode</source>
-        <translation>Unicode</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/SmileyDialog.qml" line="69"/>
-        <source>Standard</source>
-        <translation>Standard</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/SmileyDialog.qml" line="73"/>
-        <source>Addon</source>
-        <translation>Addon</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/SmileyDialog.qml" line="78"/>
-        <source>Adult</source>
-        <translation>XXX</translation>
-    </message>
-</context>
-<context>
-    <name>SyncComponent</name>
-    <message>
-        <location filename="../qml/configqml/SyncComponent.qml" line="56"/>
-        <source>sync</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/SyncComponent.qml" line="75"/>
-        <source>notify</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SyncConfig</name>
-    <message>
-        <location filename="../qml/configqml/SyncConfig.qml" line="42"/>
-        <source>Sync Interval (0=None)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/SyncConfig.qml" line="75"/>
-        <source>Min.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>friendiqa</name>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="161"/>
-        <source>Refresh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="179"/>
-        <source>Timeline</source>
-        <translation>Cronología</translation>
-    </message>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="192"/>
-        <source>Conversations</source>
-        <translation>Conversaciones</translation>
-    </message>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="205"/>
-        <source>Favorites</source>
-        <translation>Favoritos</translation>
-    </message>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="217"/>
-        <source>Replies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="231"/>
-        <source>Public Timeline</source>
-        <translation>Cronología pública</translation>
-    </message>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="244"/>
-        <source>Group news</source>
-        <translation>Grupos</translation>
-    </message>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="257"/>
-        <source>Search</source>
-        <translation>Busca</translation>
-    </message>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="270"/>
-        <source>Settings</source>
-        <translation>Ajustes</translation>
-    </message>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="281"/>
-        <source>Accounts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="294"/>
-        <source>Quit</source>
-        <translation>Salida</translation>
-    </message>
-</context>
-<context>
-    <name>newsworker</name>
-    <message>
-        <location filename="../js/newsworker.js" line="66"/>
-        <source>likes this.</source>
-        <translation>le gusta esto.</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="67"/>
-        <source>like this.</source>
-        <translation>me gusta esto.</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="70"/>
-        <source>doesn&apos;t like this.</source>
-        <translation>no de ése.</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="71"/>
-        <source>don&apos;t like this.</source>
-        <translation>no me gusta.</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="74"/>
-        <source>will attend.</source>
-        <translation>asistirá.</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="75"/>
-        <source>persons will attend.</source>
-        <translation>Personas que asistirán.</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="78"/>
-        <source>will not attend.</source>
-        <translation>no asistirá.</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="79"/>
-        <source>persons will not attend.</source>
-        <translation>Personas que no asistirán..</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="82"/>
-        <source>may attend.</source>
-        <translation>Puede asistir.</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="83"/>
-        <source>persons may attend.</source>
-        <translation>Personas que pueden asistir.</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="87"/>
-        <source>yes</source>
-        <translation>si</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="88"/>
-        <source>no</source>
-        <translation>no</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="89"/>
-        <source>maybe</source>
-        <translation>quizás</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="174"/>
-        <source>seconds</source>
-        <translation>Segundos</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="174"/>
-        <location filename="../js/newsworker.js" line="175"/>
-        <location filename="../js/newsworker.js" line="176"/>
-        <location filename="../js/newsworker.js" line="177"/>
-        <location filename="../js/newsworker.js" line="178"/>
-        <location filename="../js/newsworker.js" line="179"/>
-        <location filename="../js/newsworker.js" line="180"/>
-        <location filename="../js/newsworker.js" line="181"/>
-        <location filename="../js/newsworker.js" line="182"/>
-        <location filename="../js/newsworker.js" line="183"/>
-        <source>ago</source>
-        <translation>hace</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="175"/>
-        <source>minute</source>
-        <translation>Minuto</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="176"/>
-        <source>minutes</source>
-        <translation>Minutos</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="177"/>
-        <source>hour</source>
-        <translation>Hora</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="178"/>
-        <source>hours</source>
-        <translation>Horas</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="179"/>
-        <source>day</source>
-        <translation>Dia</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="180"/>
-        <source>days</source>
-        <translation>Dias</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="181"/>
-        <source>month</source>
-        <translation>Mes</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="182"/>
-        <source>months</source>
-        <translation>Meses</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="183"/>
-        <source>years</source>
-        <translation>Años</translation>
-    </message>
-</context>
-<context>
-    <name>service</name>
-    <message>
-        <source>Error</source>
-        <translation type="obsolete">Error</translation>
-    </message>
-    <message>
-        <location filename="../js/service.js" line="391"/>
-        <source>Undefined Array Error</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../js/service.js" line="394"/>
-        <source>JSON status Error</source>
-        <translation></translation>
-    </message>
-</context>
-</TS>
diff --git a/source-android/translations/friendiqa-it.qm b/source-android/translations/friendiqa-it.qm
deleted file mode 100644
index bb3841b..0000000
Binary files a/source-android/translations/friendiqa-it.qm and /dev/null differ
diff --git a/source-android/translations/friendiqa-it.ts b/source-android/translations/friendiqa-it.ts
deleted file mode 100644
index a125f79..0000000
--- a/source-android/translations/friendiqa-it.ts
+++ /dev/null
@@ -1,1039 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="it">
-<context>
-    <name>AccountPage</name>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="59"/>
-        <location filename="../qml/configqml/AccountPage.qml" line="370"/>
-        <location filename="../qml/configqml/AccountPage.qml" line="393"/>
-        <source>User</source>
-        <translation>Utente</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="86"/>
-        <source>Server</source>
-        <translation>Server</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="91"/>
-        <source>Nickname</source>
-        <translation>Utente</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="97"/>
-        <source>Password</source>
-        <translation>Password</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="102"/>
-        <source>Image dir.</source>
-        <translation>Directory immagini</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="113"/>
-        <source>News as</source>
-        <translation>News come</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="184"/>
-        <location filename="../qml/configqml/AccountPage.qml" line="321"/>
-        <location filename="../qml/configqml/AccountPage.qml" line="345"/>
-        <source>Error</source>
-        <translation>Errore</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="184"/>
-        <source>Nicknames containing @ symbol currently not supported</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="304"/>
-        <source>Confirm</source>
-        <translation>Conferma</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="310"/>
-        <source>No server given! </source>
-        <translation>Nessun server inserito!</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="311"/>
-        <source>No nickname given! </source>
-        <translation>Nessun utente inserito!</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="312"/>
-        <source>No password given! </source>
-        <translation>Nessuna password inserita!</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="313"/>
-        <source>No image directory given!</source>
-        <translation>Nessuna directory immagini inserita!</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="321"/>
-        <source>Wrong password!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="340"/>
-        <source>Success</source>
-        <translation>Ha funzionato!</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="340"/>
-        <source>Name</source>
-        <translation>Nome</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="420"/>
-        <source>Timeline</source>
-        <translation>Cronologia</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="425"/>
-        <source>Conversations</source>
-        <translation>Conversazioni</translation>
-    </message>
-</context>
-<context>
-    <name>CalendarTab</name>
-    <message>
-        <location filename="../qml/calendarqml/CalendarTab.qml" line="109"/>
-        <source>Events</source>
-        <translation>Eventi</translation>
-    </message>
-    <message>
-        <location filename="../qml/calendarqml/CalendarTab.qml" line="114"/>
-        <source>Own Calendar</source>
-        <translation>Calendario</translation>
-    </message>
-</context>
-<context>
-    <name>ConfigPage</name>
-    <message>
-        <location filename="../qml/configqml/ConfigPage.qml" line="66"/>
-        <source>Max. News</source>
-        <translation>Nº Max. di notizie</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/ConfigPage.qml" line="143"/>
-        <source>Sync</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ConfigTab</name>
-    <message>
-        <source>User</source>
-        <translation type="vanished">Utente</translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation type="vanished">Server</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="vanished">Utente</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="vanished">Password</translation>
-    </message>
-    <message>
-        <source>Image dir.</source>
-        <translation type="vanished">Directory immagini</translation>
-    </message>
-    <message>
-        <source>Max. News</source>
-        <translation type="vanished">Nº Max. di notizie</translation>
-    </message>
-    <message>
-        <source>News as</source>
-        <translation type="vanished">News come</translation>
-    </message>
-    <message>
-        <source>Interval (0=None)</source>
-        <translation type="vanished">Intervallo (0=nessuno)</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="vanished">Errore</translation>
-    </message>
-    <message>
-        <source>Confirm</source>
-        <translation type="vanished">Conferma</translation>
-    </message>
-    <message>
-        <source>No server given! </source>
-        <translation type="vanished">Nessun server inserito!</translation>
-    </message>
-    <message>
-        <source>No nickname given! </source>
-        <translation type="vanished">Nessun utente inserito!</translation>
-    </message>
-    <message>
-        <source>No username given! </source>
-        <translation type="vanished">Nessun utente inserito!</translation>
-    </message>
-    <message>
-        <source>No password given! </source>
-        <translation type="vanished">Nessuna password inserita!</translation>
-    </message>
-    <message>
-        <source>No image directory given!</source>
-        <translation type="vanished">Nessuna directory immagini inserita!</translation>
-    </message>
-    <message>
-        <source>No maximum news number given!</source>
-        <translation type="vanished">Nessun numero massimo di news inserito!</translation>
-    </message>
-    <message>
-        <source>Success</source>
-        <translation type="vanished">Ha funzionato!</translation>
-    </message>
-    <message>
-        <source>Timeline</source>
-        <translation type="vanished">Cronologia</translation>
-    </message>
-    <message>
-        <source>Conversations</source>
-        <translation type="vanished">Conversazioni</translation>
-    </message>
-</context>
-<context>
-    <name>ContactComponent</name>
-    <message>
-        <location filename="../qml/contactqml/ContactComponent.qml" line="41"/>
-        <source>Connect</source>
-        <translation>Connetti</translation>
-    </message>
-</context>
-<context>
-    <name>ContactDetailsComponent</name>
-    <message>
-        <location filename="../qml/contactqml/ContactDetailsComponent.qml" line="42"/>
-        <source>Connect</source>
-        <translation>Connetti</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ContactDetailsComponent.qml" line="94"/>
-        <source>Description</source>
-        <translation>Descrizione</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ContactDetailsComponent.qml" line="94"/>
-        <source>Location</source>
-        <translation>Località</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ContactDetailsComponent.qml" line="94"/>
-        <source>Posts</source>
-        <translation>Messaggi</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ContactDetailsComponent.qml" line="95"/>
-        <source>URL</source>
-        <translation>URL</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ContactDetailsComponent.qml" line="96"/>
-        <source>Created at</source>
-        <translation>Creato il</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPage</name>
-    <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="72"/>
-        <source>Connect</source>
-        <translation>Connetti</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="164"/>
-        <source>Description</source>
-        <translation>Descrizione</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="164"/>
-        <source>Location</source>
-        <translation>Località</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="164"/>
-        <source>Posts</source>
-        <translation>Messaggi</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="165"/>
-        <source>URL</source>
-        <translation>URL</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="166"/>
-        <source>Created at</source>
-        <translation>Creato il</translation>
-    </message>
-</context>
-<context>
-    <name>FriendsTab</name>
-    <message>
-        <location filename="../qml/contactqml/FriendsTab.qml" line="80"/>
-        <source>Me</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/FriendsTab.qml" line="84"/>
-        <source>Friends</source>
-        <translation>Amici</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/FriendsTab.qml" line="88"/>
-        <source>Contacts</source>
-        <translation>Contatti</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/FriendsTab.qml" line="92"/>
-        <source>Groups</source>
-        <translation>Gruppi</translation>
-    </message>
-</context>
-<context>
-    <name>ImageUploadDialog</name>
-    <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="124"/>
-        <source>Upload to album</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Album</source>
-        <translation type="vanished">Album</translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="vanished">Immagine</translation>
-    </message>
-    <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="223"/>
-        <source>Description</source>
-        <translation>Descrizione</translation>
-    </message>
-    <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="273"/>
-        <source>Upload</source>
-        <translation>Carica</translation>
-    </message>
-    <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="273"/>
-        <source>Change</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="276"/>
-        <source>Error</source>
-        <translation>Errore</translation>
-    </message>
-    <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="276"/>
-        <source> No album name given</source>
-        <translation>Nessun nome album inserito!</translation>
-    </message>
-</context>
-<context>
-    <name>MessageSend</name>
-    <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="72"/>
-        <location filename="../qml/newsqml/MessageSend.qml" line="141"/>
-        <location filename="../qml/newsqml/MessageSend.qml" line="146"/>
-        <location filename="../qml/newsqml/MessageSend.qml" line="188"/>
-        <source>to:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="200"/>
-        <source>Title (optional)</source>
-        <translation>Titolo (opzionale)</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="222"/>
-        <source>What&apos;s on your mind?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="319"/>
-        <location filename="../qml/newsqml/MessageSend.qml" line="367"/>
-        <source>Error</source>
-        <translation>Errore</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="319"/>
-        <source>Only one attachment supported at the moment.
- Remove other attachment first!</source>
-        <translation>Solo un allegato è attualmente supportato.
- Rimuovere prima gli altri allegati!</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="367"/>
-        <source>No receiver supplied!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NewsStack</name>
-    <message>
-        <location filename="../qml/newsqml/NewsStack.qml" line="158"/>
-        <source>Network Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/NewsStack.qml" line="376"/>
-        <source>More</source>
-        <translation>Ancora</translation>
-    </message>
-</context>
-<context>
-    <name>NewsTab</name>
-    <message>
-        <source>Download profile image for </source>
-        <translation type="vanished">Download immagine profilo per </translation>
-    </message>
-    <message>
-        <source>More</source>
-        <translation type="vanished">Ancora</translation>
-    </message>
-    <message>
-        <source>Timeline</source>
-        <translation type="vanished">Cronologia</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="obsolete">Errore</translation>
-    </message>
-    <message>
-        <source>Favorites</source>
-        <translation type="vanished">Favoriti</translation>
-    </message>
-    <message>
-        <source>Conversations</source>
-        <translation type="vanished">Conversazioni</translation>
-    </message>
-    <message>
-        <source>Direct Messages</source>
-        <translation type="vanished">Messaggio diretto</translation>
-    </message>
-    <message>
-        <source>Notifications</source>
-        <translation type="vanished">Notifiche</translation>
-    </message>
-    <message>
-        <source>Group news</source>
-        <translation type="vanished">Gruppi</translation>
-    </message>
-</context>
-<context>
-    <name>Newsitem</name>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="47"/>
-        <source>attending: </source>
-        <translation>attendere: </translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="105"/>
-        <source>Source: </source>
-        <translation>Codice: </translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="105"/>
-        <source>Direct Message</source>
-        <translation>Messaggio diretto</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="121"/>
-        <source>In reply to </source>
-        <translation>In risposta a </translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="133"/>
-        <source> comments</source>
-        <translation> commenti</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="282"/>
-        <source>Attending: </source>
-        <translation>Attendi: </translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="411"/>
-        <source>Reply</source>
-        <translation>Risposta</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="420"/>
-        <source>DM</source>
-        <translation>Messaggio diretto</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="426"/>
-        <source>Repost</source>
-        <translation>Condividi</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="429"/>
-        <source>Success!</source>
-        <translation>Ha funzionato!</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="434"/>
-        <source>Conversation</source>
-        <translation>Conversazione</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="444"/>
-        <source>Attending</source>
-        <translation>Attendi</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="453"/>
-        <source>yes</source>
-        <translation>si</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="458"/>
-        <source>maybe</source>
-        <translation>potrebbe</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="463"/>
-        <source>no</source>
-        <translation>no</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="470"/>
-        <source>Delete</source>
-        <translation>Cancella</translation>
-    </message>
-</context>
-<context>
-    <name>PermissionDialog</name>
-    <message>
-        <location filename="../qml/genericqml/PermissionDialog.qml" line="66"/>
-        <source>Friends</source>
-        <translation>Amici</translation>
-    </message>
-    <message>
-        <location filename="../qml/genericqml/PermissionDialog.qml" line="127"/>
-        <source>Groups</source>
-        <translation>Gruppi</translation>
-    </message>
-</context>
-<context>
-    <name>PhotoTab</name>
-    <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="124"/>
-        <source>&apos;s images</source>
-        <translation> Immagini</translation>
-    </message>
-    <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="195"/>
-        <source>All Images</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="201"/>
-        <source>Only new</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="218"/>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="223"/>
-        <source>Own Images</source>
-        <translation>Mie immagini</translation>
-    </message>
-    <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="261"/>
-        <source>More</source>
-        <translation>Ancora</translation>
-    </message>
-</context>
-<context>
-    <name>ProfileComponent</name>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="61"/>
-        <source>profile name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="62"/>
-        <source>is default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="63"/>
-        <source>hide friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="64"/>
-        <source>profile photo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="65"/>
-        <source>profile thumb</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="66"/>
-        <source>publish</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="67"/>
-        <source>publish in network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="68"/>
-        <source>description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="69"/>
-        <source>date of birth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="70"/>
-        <source>address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="71"/>
-        <source>city</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="72"/>
-        <source>region</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="73"/>
-        <source>postal code</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="74"/>
-        <source>country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="75"/>
-        <source>hometown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="76"/>
-        <source>gender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="77"/>
-        <source>marital status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="78"/>
-        <source>married with</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="79"/>
-        <source>married since</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="80"/>
-        <source>sexual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="81"/>
-        <source>politics</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="82"/>
-        <source>religion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="83"/>
-        <source>public keywords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="84"/>
-        <source>private keywords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="85"/>
-        <source>likes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="86"/>
-        <source>dislikes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="87"/>
-        <source>about</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="88"/>
-        <source>music</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="89"/>
-        <source>book</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="90"/>
-        <source>tv</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="91"/>
-        <source>film</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="92"/>
-        <source>interest</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="93"/>
-        <source>romance</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="94"/>
-        <source>work</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="95"/>
-        <source>education</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="96"/>
-        <source>social networks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="97"/>
-        <source>homepage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="183"/>
-        <source>Update</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="216"/>
-        <source>profile id</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="240"/>
-        <source>Description</source>
-        <translation>Descrizione</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="240"/>
-        <source>Location</source>
-        <translation>Località</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="240"/>
-        <source>Posts</source>
-        <translation>Messaggi</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="241"/>
-        <source>URL</source>
-        <translation>URL</translation>
-    </message>
-    <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="242"/>
-        <source>Created at</source>
-        <translation>Creato il</translation>
-    </message>
-</context>
-<context>
-    <name>SmileyDialog</name>
-    <message>
-        <location filename="../qml/newsqml/SmileyDialog.qml" line="65"/>
-        <source>Unicode</source>
-        <translation>Unicode</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/SmileyDialog.qml" line="69"/>
-        <source>Standard</source>
-        <translation>Standard</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/SmileyDialog.qml" line="73"/>
-        <source>Addon</source>
-        <translation>Addon</translation>
-    </message>
-    <message>
-        <location filename="../qml/newsqml/SmileyDialog.qml" line="78"/>
-        <source>Adult</source>
-        <translation>XXX</translation>
-    </message>
-</context>
-<context>
-    <name>SyncComponent</name>
-    <message>
-        <location filename="../qml/configqml/SyncComponent.qml" line="56"/>
-        <source>sync</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/SyncComponent.qml" line="75"/>
-        <source>notify</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SyncConfig</name>
-    <message>
-        <location filename="../qml/configqml/SyncConfig.qml" line="42"/>
-        <source>Sync Interval (0=None)</source>
-        <translation>Intervallo (0=nessuno)</translation>
-    </message>
-    <message>
-        <location filename="../qml/configqml/SyncConfig.qml" line="75"/>
-        <source>Min.</source>
-        <translation>Min.</translation>
-    </message>
-</context>
-<context>
-    <name>friendiqa</name>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="161"/>
-        <source>Refresh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="179"/>
-        <source>Timeline</source>
-        <translation>Cronologia</translation>
-    </message>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="192"/>
-        <source>Conversations</source>
-        <translation>Conversazioni</translation>
-    </message>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="205"/>
-        <source>Favorites</source>
-        <translation>Favoriti</translation>
-    </message>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="217"/>
-        <source>Replies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="231"/>
-        <source>Public Timeline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="244"/>
-        <source>Group news</source>
-        <translation type="unfinished">Gruppi</translation>
-    </message>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="257"/>
-        <source>Search</source>
-        <translation>Cerca</translation>
-    </message>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="270"/>
-        <source>Settings</source>
-        <translation>Configurazione</translation>
-    </message>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="281"/>
-        <source>Accounts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/friendiqa.qml" line="294"/>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>newsworker</name>
-    <message>
-        <location filename="../js/newsworker.js" line="66"/>
-        <source>likes this.</source>
-        <translation>mi piace.</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="67"/>
-        <source>like this.</source>
-        <translation>mi piace.</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="70"/>
-        <source>doesn&apos;t like this.</source>
-        <translation>non mi piace.</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="71"/>
-        <source>don&apos;t like this.</source>
-        <translation>non mi piace.</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="74"/>
-        <source>will attend.</source>
-        <translation>attendere.</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="75"/>
-        <source>persons will attend.</source>
-        <translation>Persone che attendono.</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="78"/>
-        <source>will not attend.</source>
-        <translation>non aspettare.</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="79"/>
-        <source>persons will not attend.</source>
-        <translation>Persone che non aspettano.</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="82"/>
-        <source>may attend.</source>
-        <translation>puoi attendere.</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="83"/>
-        <source>persons may attend.</source>
-        <translation>Persone che possono attendere.</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="87"/>
-        <source>yes</source>
-        <translation>si</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="88"/>
-        <source>no</source>
-        <translation>no</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="89"/>
-        <source>maybe</source>
-        <translation>potrebbe</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="174"/>
-        <source>seconds</source>
-        <translation>secondi</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="174"/>
-        <location filename="../js/newsworker.js" line="175"/>
-        <location filename="../js/newsworker.js" line="176"/>
-        <location filename="../js/newsworker.js" line="177"/>
-        <location filename="../js/newsworker.js" line="178"/>
-        <location filename="../js/newsworker.js" line="179"/>
-        <location filename="../js/newsworker.js" line="180"/>
-        <location filename="../js/newsworker.js" line="181"/>
-        <location filename="../js/newsworker.js" line="182"/>
-        <location filename="../js/newsworker.js" line="183"/>
-        <source>ago</source>
-        <translation>fa</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="175"/>
-        <source>minute</source>
-        <translation>minuti</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="176"/>
-        <source>minutes</source>
-        <translation>minuti</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="177"/>
-        <source>hour</source>
-        <translation>ora</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="178"/>
-        <source>hours</source>
-        <translation>ore</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="179"/>
-        <source>day</source>
-        <translation>giorno</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="180"/>
-        <source>days</source>
-        <translation>giorni</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="181"/>
-        <source>month</source>
-        <translation>mese</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="182"/>
-        <source>months</source>
-        <translation>mesi</translation>
-    </message>
-    <message>
-        <location filename="../js/newsworker.js" line="183"/>
-        <source>years</source>
-        <translation>anni</translation>
-    </message>
-</context>
-<context>
-    <name>service</name>
-    <message>
-        <source>Error</source>
-        <translation type="obsolete">Errore</translation>
-    </message>
-    <message>
-        <location filename="../js/service.js" line="391"/>
-        <source>Undefined Array Error</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../js/service.js" line="394"/>
-        <source>JSON status Error</source>
-        <translation></translation>
-    </message>
-</context>
-</TS>
diff --git a/source-linux/application.qrc b/source-linux/application.qrc
index 9e0b393..7d672af 100644
--- a/source-linux/application.qrc
+++ b/source-linux/application.qrc
@@ -2,35 +2,67 @@
     <qresource prefix="/">
         <file>qtquickcontrols2.conf</file>
         <file>qml/friendiqa.qml</file>
+        <file>qml/newsqml/NewsStack.qml</file>
         <file>qml/newsqml/NewsTab.qml</file>
         <file>qml/newsqml/Newsitem.qml</file>
         <file>qml/newsqml/MessageSend.qml</file>
         <file>qml/newsqml/Conversation.qml</file>
         <file>qml/newsqml/FriendicaActivities.qml</file>
+        <file>qml/newsqml/Hashtag.qml</file>
+        <file>qml/newsqml/NewsImage.qml</file>
+        <file>qml/newsqml/NewsVideo.qml</file>
+        <file>qml/newsqml/ContactPage.qml</file>
+        <file>qml/newsqml/NewsLink.qml</file>
+        <file>qml/newsqml/NewsVideoLarge.qml</file>
+        <file>qml/newsqml/NewsYplayer.qml</file>
+        <file>qml/newsqml/SmileyDialog.qml</file>
         <file>qml/contactqml/FriendsTab.qml</file>
         <file>qml/contactqml/GroupComponent.qml</file>
-        <file>qml/contactqml/ContactComponent.qml</file>
+        <file>qml/contactqml/ProfileComponent.qml</file>
         <file>qml/contactqml/ContactDetailsComponent.qml</file>
         <file>qml/contactqml/Contactlist.qml</file>
-        <file>qml/genericqml/BlueButton.qml</file>
         <file>qml/photoqml/PhotoComponent.qml</file>
         <file>qml/photoqml/PhotogroupComponent.qml</file>
         <file>qml/photoqml/PhotoTab.qml</file>
+        <file>qml/photoqml/ImageUploadDialog.qml</file>
+        <file>qml/genericqml/ImagePicker.qml</file>
+        <file>qml/genericqml/ImagePickerLinux.qml</file>
+        <file>qml/genericqml/Search.qml</file>
+        <file>qml/genericqml/IntentReceiver.qml</file>
+        <file>qml/genericqml/MButton.qml</file>
+        <file>qml/genericqml/LinuxSync.qml</file>
+        <file>qml/genericqml/BlueButton.qml</file>
+        <file>qml/genericqml/ContactComponent.qml</file>
+        <file>qml/genericqml/PermissionDialog.qml</file>
+        <file>qml/calendarqml/CalendarTab.qml</file>
+        <file>qml/calendarqml/CalendarDay.qml</file>
+        <file>qml/calendarqml/EventList.qml</file>
+        <file>qml/configqml/RegisterPage.qml</file>
+        <file>qml/configqml/AccountPage.qml</file>
+        <file>qml/configqml/SyncConfig.qml</file>
+        <file>qml/configqml/SyncComponent.qml</file>
         <file>qml/configqml/InfoBox.qml</file>
         <file>qml/configqml/ConfigPage.qml</file>
+        <file>qml/configqml/OSSettingsAndroid.qml</file>
+        <file>qml/configqml/OSSettingsLinux.qml</file>
+        <file>js/image.js</file>
+        <file>js/yplayer.html</file>
         <file>js/layout.js</file>
         <file>js/photoworker.js</file>
         <file>js/service.js</file>
         <file>js/news.js</file>
         <file>js/newsworker.js</file>
         <file>js/helper.js</file>
+        <file>js/smiley.js</file>
+        <file>translations/friendiqa-it.ts</file>
+        <file>translations/friendiqa-it.qm</file>
+        <file>translations/friendiqa-de.qm</file>
+        <file>translations/friendiqa-de.ts</file>
+        <file>translations/friendiqa-es.qm</file>
+        <file>translations/friendiqa-es.ts</file>
         <file>images/defaultcontact.jpg</file>
         <file>images/fontawesome-webfont.ttf</file>
         <file>images/folder-blue.png</file>
-        <file>qml/configqml/OSSettingsAndroid.qml</file>
-        <file>qml/configqml/OSSettingsLinux.qml</file>
-        <file>qml/newsqml/SmileyDialog.qml</file>
-        <file>js/smiley.js</file>
         <file>images/smileys/animals/bee.gif</file>
         <file>images/smileys/animals/bigspider.gif</file>
         <file>images/smileys/animals/bunny.gif</file>
@@ -196,6 +228,7 @@
         <file>images/smileys/adult/finger.gif</file>
         <file>images/smileys/adult/sperm.gif</file>
         <file>images/smileys/adult/tits.gif</file>
+        <file>images/addImage.png</file>   
         <file>common/filesystem.cpp</file>
         <file>common/filesystem.h</file>
         <file>common/friendiqa.cpp</file>
@@ -203,34 +236,5 @@
         <file>common/uploadableimage.h</file>
         <file>common/xhr.cpp</file>
         <file>common/xhr.h</file>
-        <file>qml/calendarqml/CalendarTab.qml</file>
-        <file>qml/calendarqml/CalendarDay.qml</file>
-        <file>qml/calendarqml/EventList.qml</file>
-        <file>translations/friendiqa-de.qm</file>
-        <file>translations/friendiqa-de.ts</file>
-        <file>translations/friendiqa-es.qm</file>
-        <file>translations/friendiqa-es.ts</file>
-        <file>qml/photoqml/ImageUploadDialog.qml</file>
-        <file>qml/genericqml/PermissionDialog.qml</file>
-        <file>images/addImage.png</file>
-        <file>qml/genericqml/ImagePicker.qml</file>
-        <file>qml/genericqml/ImagePickerLinux.qml</file>
-        <file>js/image.js</file>
-        <file>qml/contactqml/ProfileComponent.qml</file>
-        <file>translations/friendiqa-it.ts</file>
-        <file>qml/genericqml/Search.qml</file>
-        <file>qml/newsqml/Hashtag.qml</file>
-        <file>qml/genericqml/IntentReceiver.qml</file>
-        <file>qml/newsqml/NewsImage.qml</file>
-        <file>qml/newsqml/NewsVideo.qml</file>
-        <file>qml/newsqml/ContactPage.qml</file>
-        <file>qml/newsqml/NewsLink.qml</file>
-        <file>qml/configqml/RegisterPage.qml</file>
-        <file>qml/configqml/AccountPage.qml</file>
-        <file>qml/newsqml/NewsStack.qml</file>
-        <file>qml/configqml/SyncConfig.qml</file>
-        <file>qml/configqml/SyncComponent.qml</file>
-        <file>qml/genericqml/MButton.qml</file>
-        <file>qml/genericqml/LinuxSync.qml</file>
     </qresource>
 </RCC>
diff --git a/source-linux/common/alarmandroid.cpp b/source-linux/common/alarmandroid.cpp
index b1fcbfd..6073baf 100644
--- a/source-linux/common/alarmandroid.cpp
+++ b/source-linux/common/alarmandroid.cpp
@@ -43,6 +43,7 @@ ALARM::ALARM(QObject *parent) : QObject(parent){}
 
 void ALARM::setAlarm(int interval)
 {
+    //qDebug() << "alarm "<< interval;
     QVariantMap message;
     message["value"] = interval;
     AndroidNative::SystemDispatcher::instance()->loadClass("androidnative.Util");
diff --git a/source-linux/common/alarmlinux.cpp b/source-linux/common/alarmlinux.cpp
index c9b0a57..cdd75c3 100644
--- a/source-linux/common/alarmlinux.cpp
+++ b/source-linux/common/alarmlinux.cpp
@@ -29,12 +29,11 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-//#include <QtAndroidExtras/QAndroidJniObject>
-//#include <QtAndroidExtras/QAndroidJniEnvironment>
 #include "alarm.h"
 #include <QtCore/QDebug>
 #include <QtDBus/QtDBus>
-//#include "AndroidNative/systemdispatcher.h"
+#include <QJsonArray>
+
 
 ALARM *ALARM::instance()
 {
@@ -49,25 +48,23 @@ void ALARM::setAlarm(int interval)
     qDebug() << interval;
     QVariantMap message;
     message["value"] = interval;
-   // AndroidNative::SystemDispatcher::instance()->loadClass("androidnative.Util");
-   // AndroidNative::SystemDispatcher::instance()->dispatch("androidnative.Util.setSchedule", message);
-    //AndroidNative::SystemDispatcher::instance()->dispatch("androidnative.Util.stopService", message);
 }
 
 void ALARM::notify(QString title, QString text, int id)
 {
     qDebug() << title << text;
-    QVariantMap message;
-    message["title"] = title;
-    message["message"] =  text;
+//    QVariantMap message;
+//    message["title"] = title;
+//    message["message"] =  text;
+    QStringList actionlist;
+    QMap<QString,QVariant> hint;
     QDBusConnection bus = QDBusConnection::sessionBus();
     QDBusInterface dbus_iface("org.freedesktop.Notifications", "/org/freedesktop/Notifications",
                               "org.freedesktop.Notifications", bus);
     QString appname="Friendiqa";
     uint v=12321;
     if (dbus_iface.isValid()){
-
-        dbus_iface.call("Notify",appname,v,"",title,text,"","",5000);
+        dbus_iface.call("Notify",appname,v,"",title,text,actionlist,hint,10000);
+        //qDebug() << "Qdebug error " << dbus_iface.lastError();
     }
-   // AndroidNative::SystemDispatcher::instance()->dispatch("Notifier.notify", message);
 }
diff --git a/source-linux/common/friendiqa.cpp b/source-linux/common/friendiqa.cpp
index 3eccb3c..f06f39a 100644
--- a/source-linux/common/friendiqa.cpp
+++ b/source-linux/common/friendiqa.cpp
@@ -31,6 +31,7 @@
 
 #include <QApplication>
 #include <QtQml/QQmlEngine>
+#include <QtWebEngine>
 //#include <QAndroidService>
 //#include <QtAndroid>
 #include <QtQuick>
@@ -88,6 +89,7 @@ int main(int argc, char *argv[]) {
     view.rootContext()->setContextProperty("alarm", alarm);
     UPDATENEWS* updatenews = UPDATENEWS::instance();
     view.rootContext()->setContextProperty("updatenews", updatenews);
+    QtWebEngine::initialize();
     view.setSource(QUrl("qrc:/qml/friendiqa.qml"));
     view.show();
     view.connect(view.rootContext()->engine(), SIGNAL(quit()), &app, SLOT(quit()));
diff --git a/source-linux/common/uploadableimage.cpp b/source-linux/common/uploadableimage.cpp
index 7ef3524..23ef7fc 100644
--- a/source-linux/common/uploadableimage.cpp
+++ b/source-linux/common/uploadableimage.cpp
@@ -36,6 +36,19 @@
 #include <QDebug>
 #include <QFileInfo>
 #include <QUrl>
+#include <QTransform>
+
+void UploadableImage::setAngle(const int &b) {
+    if (b != m_angle) {
+        m_angle = b;
+
+        qDebug() << "UploadableImage::setAngle : " << m_angle;
+        if (m_angle==0) {
+            emit angleChanged();
+            return;
+        }
+    }
+}
 
 void UploadableImage::setSource(const QString &a) {
     if (a != m_source) {
@@ -55,6 +68,12 @@ void UploadableImage::setSource(const QString &a) {
         }
 
         QImage fullimage = QImage(QUrl(m_source).toLocalFile());
+
+        if (m_angle!=0){
+            QTransform transform;
+            transform.rotate(qreal(m_angle));
+            fullimage=fullimage.transformed(transform);
+        }
         if (fullimage.width() > 800 || fullimage.height() > 800) {
             if (fullimage.width() > fullimage.height()) {
                 m_image = fullimage.scaledToWidth(800);
@@ -101,6 +120,9 @@ QString UploadableImage::source() const {
     return m_source;
 }
 
+int UploadableImage::angle() const{
+    return m_angle;
+}
 //QString UploadableImage::base64() const {
 //    return m_base64;
 //}
diff --git a/source-linux/common/uploadableimage.h b/source-linux/common/uploadableimage.h
index 665bf82..810e4e8 100644
--- a/source-linux/common/uploadableimage.h
+++ b/source-linux/common/uploadableimage.h
@@ -40,6 +40,7 @@ class UploadableImage : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QString source READ source WRITE setSource NOTIFY sourceChanged)
+    Q_PROPERTY(int angle READ angle WRITE setAngle NOTIFY angleChanged)
     //Q_PROPERTY(QString base64 READ base64 NOTIFY base64Changed)
     Q_PROPERTY(QString filename READ filename NOTIFY filenameChanged)
     Q_PROPERTY(QString mimetype READ mimetype NOTIFY mimetypeChanged)
@@ -47,8 +48,9 @@ class UploadableImage : public QObject
 
 public:
     void setSource(const QString &a);
+    void setAngle(const int &b);
     QString source() const;
-
+    int angle() const;
     //QString base64() const;
     QString filename() const;
     QString mimetype() const;
@@ -56,6 +58,7 @@ public:
     QByteArray bytes();
 signals:
     void sourceChanged();
+    void angleChanged();
     //void base64Changed();
     void filenameChanged();
     void mimetypeChanged();
@@ -63,6 +66,7 @@ signals:
 private:
     QString m_source;
     QImage m_image;
+    int m_angle;
     //QString m_base64;
     QString m_filename;
     QString m_mimetype;
diff --git a/source-linux/common/xhr.cpp b/source-linux/common/xhr.cpp
index fd29d29..a126ff2 100644
--- a/source-linux/common/xhr.cpp
+++ b/source-linux/common/xhr.cpp
@@ -251,19 +251,29 @@ void XHR::post()
     }
 
     UploadableImage uimg;
-    QHashIterator<QString, QString> ifiles(files);
-    while(ifiles.hasNext()) {
-        ifiles.next();
-
-        uimg.setSource(ifiles.value());
-        //qDebug() << "\t image: " << uimg.mimetype() << ", " << ifiles.key();
+    if (files.contains("media")){
+        uimg.setAngle(files.value("angle").toInt());
+        uimg.setSource(files.value("media"));
 
         QHttpPart imagePart;
         imagePart.setHeader(QNetworkRequest::ContentTypeHeader, QVariant(uimg.mimetype()));
-        imagePart.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"" + ifiles.key() + "\"; filename=\""+uimg.filename()+"\""));
+        imagePart.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"media\"; filename=\""+uimg.filename()+"\""));
         imagePart.setBody(uimg.bytes());
         multiPart->append(imagePart);
     }
+//    QHashIterator<QString, QString> ifiles(files);
+//    while(ifiles.hasNext()) {
+//        ifiles.next();
+
+//        uimg.setSource(ifiles.value());
+//        //qDebug() << "\t image: " << uimg.mimetype() << ", " << ifiles.key();
+
+//        QHttpPart imagePart;
+//        imagePart.setHeader(QNetworkRequest::ContentTypeHeader, QVariant(uimg.mimetype()));
+//        imagePart.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"" + ifiles.key() + "\"; filename=\""+uimg.filename()+"\""));
+//        imagePart.setBody(uimg.bytes());
+//        multiPart->append(imagePart);
+//    }
 
     QByteArray loginData = m_login.toLocal8Bit().toBase64();
     QString headerData = "Basic " + loginData;
diff --git a/source-linux/friendiqa.pro b/source-linux/friendiqa.pro
index e4f9de6..5fc8454 100644
--- a/source-linux/friendiqa.pro
+++ b/source-linux/friendiqa.pro
@@ -13,7 +13,7 @@
 TEMPLATE = app
 TARGET = friendiqa
 CONFIG += release
-QT += qml quick gui widgets sql webview dbus
+QT += qml quick gui widgets sql webview dbus webengine
 
 SOURCES += common/friendiqa.cpp \
 	common/uploadableimage.cpp \
@@ -47,6 +47,7 @@ HEADERS += \
     
 DISTFILES += \
     qml/calendarqml/*.qml \
+    qml/newsqml/NewsVideoLarge.qml \
     translations/*.ts \
     translations/*.qm \
     qml/*.qml \
diff --git a/source-linux/js/image.js b/source-linux/js/image.js
index 9a91d09..de5296c 100644
--- a/source-linux/js/image.js
+++ b/source-linux/js/image.js
@@ -172,21 +172,25 @@ function deleteContacts(database,user,callback) { // does nothing useful at the
 // })
 //}
 
-function newRequestFriendsAlbumPictures(login,friend,rootwindow,callback){
+function newRequestFriendsAlbumPictures(login,friend,rootwindow,callback){print("newRequestFriendsAlbumPictures");
 // screenscraping of albums page of contact with remoteAuth
-    Helperjs.friendicaRemoteAuthRequest(login,friend.url.replace("profile","photos"),friend.url,rootwindow,function(photohtml){
-        try {var obj=JSON.parse(photohtml);
+    //commented out for broken remoteauth
+    //Helperjs.friendicaRemoteAuthRequest(login,friend.url.replace("profile","photos"),friend.url,rootwindow,function(photohtml){
+    Helperjs.friendicaWebRequest(friend.url.replace("profile","photos"),rootwindow,function(photohtml){
+        try {var obj=JSON.parse(photohtml);print ("Photohtml: "+photohtml)
             if (obj.hasOwnProperty('status')){
                 Helperjs.friendicaWebRequest(friend.url.replace("profile","photos"),rootwindow,function(photohtml){
                     getAlbumFromHtml(photohtml,false,rootwindow,callback)})
             }}
         catch (e){
-            getAlbumFromHtml(photohtml,true,rootwindow,callback)
+            //getAlbumFromHtml(photohtml,true,rootwindow,callback)
+            getAlbumFromHtml(photohtml,false,rootwindow,callback)
         }
     })
 }
 
 function getAlbumFromHtml(photohtml,remoteAuthBool,rootwindow,callback){
+    print(photohtml);
     var photoarray=[];
     var arr = photohtml.split("sidebar-photos-albums-li");
     for (var i=2;i<arr.length;i++){
diff --git a/source-linux/js/news.js b/source-linux/js/news.js
index a827f11..6a0439d 100644
--- a/source-linux/js/news.js
+++ b/source-linux/js/news.js
@@ -68,15 +68,19 @@ function requestGroups(login,database,rootwindow,callback){
 function listFriends(login,database,callback,filter){
     var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
     var filtertext='';
-    try {filtertext=' AND screen_name like "' + filter+'%"'}catch(e){}
+    //try {filtertext=' AND screen_name like "' + filter+'%"'}catch(e){}
+    var filtertext=new RegExp(".*"+filter.toLowerCase()+".*")
+//    if (filter){filtertext=' AND (screen_name like "' + filter+'%" OR name like "' + Qt.btoa(filter)+'%")'}
     db.transaction( function(tx) {
         //var result = tx.executeSql('SELECT * from contacts WHERE username="'+login.username+'" AND isFriend>0'+filtertext);
-        //print('SELECT * from contacts WHERE username="'+login.username+'"'+filtertext);
-        var result = tx.executeSql('SELECT * from contacts WHERE username="'+login.username+'" AND isFriend>0'+filtertext);
+        var result = tx.executeSql('SELECT * from contacts WHERE username="'+login.username+'" AND isFriend>0');
         // check for friends
         var contactlist=[];
         for (var i=0;i<result.rows.length;i++){
-            contactlist.push(result.rows.item(i))
+            var contact=result.rows.item(i)
+            contact.name=Qt.atob(contact.name);
+            if(filtertext.test(contact.name.toLowerCase())|| filtertext.test(contact.screen_name.toLowerCase())){
+                contactlist.push(contact)}
         }
         callback(contactlist)
     });
@@ -183,7 +187,7 @@ function storeNews(login,database,news,rootwindow){
 // save news after contacts download, call next function
     var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
     for (var i=0;i<news.length;i++){
-        //print('store news data for ' + news[i].id+JSON.stringify(news[i].friendica_author));
+        print('store news data for ' + login.username+news[i].messagetype+Qt.btoa(news[i].text)+news[i].created_at+ news[i].in_reply_to_status_id+ news[i].source+ news[i].id+news[i].in_reply_to_user_id+news[i].geo+news[i].favorited+ news[i].user.id+Qt.btoa(news[i].statusnet_html)+news[i].statusnet_conversation_id+ Qt.btoa(JSON.stringify(friendica_activities))+"[]"+attachments+news[i].friendica_author.url);
         //var ausdruck=news[i];
         var likearray=[];var dislikearray=[];var attendyesarray=[];var attendnoarray=[];var attendmaybearray=[];
         if(news[i].hasOwnProperty('friendica_activities')){
@@ -277,8 +281,9 @@ function newsfromdb(database,login,messagetype,callback,contact,stop_time){
             stop="<="+rs.rows.item(0).created_at}catch(e){stop="<99999999999999"}}
         else{var stop="<"+stop_time}
         var contactfilter="";if(contact){contactfilter=" AND (uid='"+contact+"' OR friendica_owner='"+contact+"')"}
-        //print('select * from news WHERE username="'+username+'" AND created_at'+stop+contactfilter+' ORDER BY created_at DESC LIMIT 20');
-        var newsrs=tx.executeSql('select * from news WHERE username="'+login.username+'" AND messagetype="'+messagetype+'" AND created_at'+stop+contactfilter+' ORDER BY created_at DESC LIMIT 20');
+            if (messagetype=="0"){messagetype="0,5"}
+        //print('select * from news WHERE username="'+login.username+'" AND messagetype IN ( '+messagetype+' ) AND created_at'+stop+contactfilter+' ORDER BY created_at DESC LIMIT 20');
+        var newsrs=tx.executeSql('select * from news WHERE username="'+login.username+'" AND messagetype IN ( '+messagetype+' ) AND created_at'+stop+contactfilter+' ORDER BY created_at DESC LIMIT 20');
         var newsArray=[];
         var allcontacts=getAllContacts(database,login.username);
 
@@ -462,7 +467,8 @@ function chatsfromdb(database,login,messagetype,callback,stop_time){
         try{var rs = tx.executeSql('select created_at from news WHERE username="'+login.username+'" AND messagetype="'+messagetype+'" ORDER BY created_at DESC LIMIT 1');
         stop="<="+rs.rows.item(0).created_at}catch(e){stop="<99999999999999"}}
     else{var stop="<"+stop_time}
-    var conversationsrs=tx.executeSql('select DISTINCT statusnet_conversation_id from news WHERE username="'+login.username+'" AND created_at'+stop+' AND messagetype="'+messagetype+'" ORDER BY created_at DESC LIMIT 20'); //+' ORDER BY created_at DESC LIMIT 20');
+    if (messagetype=="1"){messagetype="1,5"}
+    var conversationsrs=tx.executeSql('select DISTINCT statusnet_conversation_id from news WHERE username="'+login.username+'" AND created_at'+stop+' AND messagetype IN ( "'+messagetype+'" ) ORDER BY created_at DESC LIMIT 20'); //+' ORDER BY created_at DESC LIMIT 20');
     var result = tx.executeSql('SELECT status_id from news WHERE username="'+login.username+'" AND messagetype=0 ORDER BY status_id  DESC LIMIT 1');
     try{var lastid=result.rows.item(0).status_id;}catch(e){var lastid=0};
     var conversations=[];
diff --git a/source-linux/js/newsworker.js b/source-linux/js/newsworker.js
index 1be2bda..68c37bc 100644
--- a/source-linux/js/newsworker.js
+++ b/source-linux/js/newsworker.js
@@ -56,7 +56,7 @@ else{
         var forumname="";
         try{if (newsitemobject.messagetype==0&&newsitemobject.hasOwnProperty('friendica_author')&&
                     ((newsitemobject.friendica_author.url)!=(newsitemobject.user.url))&&((newsitemobject.friendica_author.url)!=null)){
-            print(" Friendica Author "+JSON.stringify(newsitemobject.friendica_author));
+            //print(" Friendica Author "+JSON.stringify(newsitemobject));
             forumname=" via "+newsitemobject.user.name;
             newsitemobject.user=newsitemobject.friendica_author;
         }}catch(e){print("forum name "+e)}
@@ -138,20 +138,21 @@ else{
                if ((attachmentList.length==0) || (attachmentList[attachmentList.length-1].url!=ptvideohelper.url)){attachmentList.push(ptvideohelper)}
            }
       }
-//      if (newsitemobject.text.indexOf("https://www.youtube.com/watch")>-1){
-//            //print("message "+msg.options.showWebsiteForLinks);
-//           if (msg.options.showYoutube!="false"){
-//               var ythelper={mimetype:"video/youtube"}
-//               var yttext=newsitemobject.text;
-//               while (yttext.indexOf("https://www.youtube.com/watch")>-1){
-//                   var ythelperstringposition=linktext.indexOf("watch?v=");
-//                   var ytposend=findend(yttext,ythelperstringposition);
-//                   ythelper.url=yttext.substring(yttext.lastIndexOf("http",linkhelperstringposition),linkposend);
-//                   linktext=linktext.substring(linkhelperstringposition+5,linktext.length)
-//                   if ((attachmentList.length==0) || (attachmentList[attachmentList.length-1].url!=linkhelper.url)){attachmentList.push(linkhelper)}
-//               }
-//           }
-//      }
+      if (newsitemobject.text.indexOf("youtube.com/watch?v")>-1){
+            //print("message "+msg.options.showWebsiteForLinks);
+           //if (msg.options.showYoutube!="false"){
+
+               var yttext=newsitemobject.text;
+               while (yttext.indexOf("youtube.com/watch?v")>-1){
+                   var ythelperstringposition=yttext.indexOf("watch?v=");
+                   var ytposend=findend(yttext,ythelperstringposition);
+                   var ythelper={mimetype:"video/youtube"}
+                   ythelper.url=yttext.substring(ythelperstringposition+8,ytposend);
+                    yttext=yttext.substring(ytposend,yttext.length);
+                   if ((attachmentList.length==0) || (attachmentList[attachmentList.length-1].url!=ythelper.url)){attachmentList.push(ythelper)}
+               }
+           //}
+      }
       
 //        if (newsitemobject.text.indexOf(".html")>-1){
 //            //print("message "+msg.options.showWebsiteForLinks);
@@ -169,6 +170,11 @@ else{
 //      }
 
         newsitemobject.attachmentList=attachmentList;
+
+        if ((msg.options.hasOwnProperty("hide_nsfw"))&&(msg.options.hide_nsfw==1)&&(newsitemobject.text.indexOf("#nsfw")>-1)){
+            newsitemobject.nsfw=true
+        } else{newsitemobject.nsfw=false}
+
         var seconds=(msg.currentTime-newsitemobject.created_at)/1000;
         var timestring="";
         if (seconds<60) {timestring=seconds+" "+qsTr("seconds") +" "+qsTr("ago");}
diff --git a/source-linux/js/service.js b/source-linux/js/service.js
index 3b9588c..cfba95b 100644
--- a/source-linux/js/service.js
+++ b/source-linux/js/service.js
@@ -340,12 +340,15 @@ function  cleanNews(database,callback){
              //var maxnewsrs = tx.executeSql("SELECT DISTINCT maxnews FROM config");
              var maxnewsrs = tx.executeSql("SELECT v FROM globaloptions WHERE k='max_news'");
           var maxnews=1000; if(maxnewsrs.rows.length>0){ maxnews=maxnewsrs.rows.item(0).v};
-             var newscountrs = tx.executeSql('SELECT COUNT(*) from news');
-             var newscount = newscountrs.rows.item(0)["COUNT(*)"];//print("newscount "+newscount)
-             if (newscount>maxnews){
-                 var lastvalidtimers= tx.executeSql('SELECT DISTINCT created_at FROM news ORDER BY created_at ASC LIMIT ' +(newscount-maxnews));
-                 var lastvalidtime=lastvalidtimers.rows.item(newscount-maxnews-1).created_at;
-                 var deleters = tx.executeSql('DELETE from news WHERE created_at<='+lastvalidtime)}
+          for (var i=0; i<6;i++){
+              if (i!=0){maxnews=maxnews/5}
+              var newscountrs = tx.executeSql('SELECT COUNT(*) from news WHERE messagetype='+i);
+              var newscount = newscountrs.rows.item(0)["COUNT(*)"];//print("newscount "+newscount)
+              if (newscount>maxnews){
+                  var lastvalidtimers= tx.executeSql('SELECT DISTINCT created_at FROM news WHERE messagetype='+i+' ORDER BY created_at ASC LIMIT ' +(newscount-maxnews));
+                  var lastvalidtime=lastvalidtimers.rows.item(newscount-maxnews-1).created_at;
+                  var deleters = tx.executeSql('DELETE from news WHERE messagetype='+i+' AND created_at<='+lastvalidtime)}
+          }
              callback()
      })
  }
@@ -394,13 +397,40 @@ function processNews(api,data){
         Helperjs.showMessage(qsTr("JSON status Error"),"API:\n" +login.server+api+"\n Return: \n"+data,root)
     }
     else if (!(Array.isArray(newslist))){
-        //print("processNews not array"+newslist+JSON.stringify(newslist));
+//        print("processNews not array"+newslist+JSON.stringify(newslist));
+//        if(newslist.hasOwnProperty('id')){
+//            newslist.created_at=Date.parse(Newsjs.cleanDate(newslist.created_at));
+//            newslist.messagetype=5;
+//            newslist.friendica_author=cleanUser(newslist.friendica_author);
+//            newslist.user=cleanUser(newslist.user);
+//            if(newslist.in_reply_to_user_id){newslist.reply_user=Newsjs.objFromArray(allcontacts,"id",newslist.in_reply_to_user_id)}
+//        var dummynewslist=[newslist];
+//        Newsjs.storeNews(login,db,dummynewslist,root);
+//        switch(newsSwipeview.stacktype){
+//            case "Home":messagetype=0;break;
+//            case "DirectMessages": messagetype=1;break;
+//            case "Notifications":messagetype=2;break;
+//            case "Replies":messagetype=3;break;
+//            default:messagetype=0;
+//        }
+//        if((login.newsViewType=="Conversations")&&(newsSwipeview.stacktype=="Home")){
+//            Newsjs.chatsfromdb(db,login,messagetype,function(dbnews,lastid){
+//                lastnewsid=lastid;
+//                showNews(dbnews);
+//            })
+//        }
+//        else{Newsjs.newsfromdb(db,login,messagetype,function(dbnews,lastid){
+//            lastnewsid=lastid;
+//            showNews(dbnews)
+//         })}
+
+//        }
         replytimer.restart()
     }
     else {
         var allcontacts=[];
         allcontacts=Newsjs.getAllContacts(db,login.username);
-        if (api=="/api/direct_messages/all"){
+        if (api=="/api/direct_messages/all" || api=="/api/direct_messages/conversation"){
             for (var n in newslist){
                 newslist[n].created_at=Date.parse(Newsjs.cleanDate(newslist[n].created_at));
                 newslist[n].messagetype=1;
@@ -412,6 +442,8 @@ function processNews(api,data){
                 newslist[n].friendica_owner=newslist[n].user;
                 newslist[n].friendica_author=newslist[n].user;
                 newslist[n].statusnet_html=newslist[n].text;
+                newslist[n].in_reply_to_user_id=newslist[n].recipient_id
+                if(newslist[n].in_reply_to_user_id){newslist[n].reply_user=Newsjs.objFromArray(allcontacts,"id",newslist[n].in_reply_to_user_id)}
         }}
         else if (api=="/api/friendica/notifications"){
             for (var n in newslist){
@@ -488,7 +520,7 @@ function processNews(api,data){
         }
 
 
-        if (api=="/api/conversation/show"){
+        if (api=="/api/conversation/show"|| api=="/api/direct_messages/conversation"){
             newslist.reverse();
             newstab.conversation=newslist
         }
diff --git a/source-linux/js/yplayer.html b/source-linux/js/yplayer.html
index 8222d36..b16816a 100644
--- a/source-linux/js/yplayer.html
+++ b/source-linux/js/yplayer.html
@@ -16,8 +16,9 @@
         
         var player;
         function onYouTubeIframeAPIReady() {
+			console.log("Videoid: "+getVideoId());
           player = new YT.Player('player', {
-            playerVars: { 'html5': 1, 'iv_load_policy': 3 },
+            playerVars: { 'html5': 1, 'iv_load_policy': 3, 'autoplay': 1 },
             frameborder: '0',
             height: '100%',
             width: '100%',
@@ -31,6 +32,7 @@
         
         function onPlayerReady(event) {
           document.title = 0;
+          event.target.playVideo();
         }
 
         function onPlayerStateChange(event) {
@@ -42,4 +44,4 @@
         }
     </script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/source-linux/qml/configqml/AccountPage.qml b/source-linux/qml/configqml/AccountPage.qml
index f593ed1..b5ed38e 100644
--- a/source-linux/qml/configqml/AccountPage.qml
+++ b/source-linux/qml/configqml/AccountPage.qml
@@ -65,7 +65,7 @@ Page{
                 var useritems="";
                 for (var i=0;i<accountPage.users.length;i++){
 
-                    useritems=useritems+"MenuItem{font.pixelSize: 3*mm; text:'"+accountPage.users[i].username+
+                    useritems=useritems+"MenuItem{font.pixelSize: 3*mm;width:accountPage.width*2/3; text:'"+accountPage.users[i].username+
                         "'; onTriggered: {Service.readConfig(db,function(obj){
                         userButton.text=obj.username;
                         servername.text=obj.server;
@@ -191,7 +191,7 @@ Page{
         text: "\uf234"
         font.pixelSize: 3*mm
         onClicked: {
-            configStack.push({item:"qrc:/qml/configqml/RegisterPage.qml",properties:{url:servername.text+"/register?nickname="+username.getText(0,username.length)}})
+            root.push("qrc:/qml/configqml/RegisterPage.qml",{url:servername.text+"/register?nickname="+username.getText(0,username.length)})
         }
     }
 
@@ -217,6 +217,7 @@ Page{
              width: imagestoreFlickable.width
              height: imagestoreFlickable.height
              font.pixelSize:3*mm
+             text: (osSettings.osType=="Android") && (filesystem.fileexist("/storage/emulated/0/Pictures/"))?"/storage/emulated/0/Pictures/":""
              wrapMode: TextEdit.NoWrap
              onCursorRectangleChanged: Layoutjs.ensureVisibility(cursorRectangle,imagestoreFlickable)
          }
@@ -405,6 +406,7 @@ Page{
     Button{
         id:closeButton
         height: 8*mm
+        width: 5*mm
         anchors.top: parent.top
         anchors.topMargin: 1*mm
         anchors.right: parent.right
@@ -428,7 +430,7 @@ Page{
     }
 
    Component.onCompleted: {
-      try{Helperjs.readData(db,"config","",function(storedUsers){
+       try{Helperjs.readData(db,"config","",function(storedUsers){
           storedUsers.sort(function(obj1, obj2) {
               return obj1.isActive - obj2.isActive;
           })
@@ -445,13 +447,8 @@ Page{
             //messageIntervalSlider.value=obj.timerInterval;
             if( obj.isActive==0){userButton.font.bold='true'} else {userButton.font.bold='false'}
           },"isActive",0)
-      })
-//            Service.readGlobaloptions(db,function(go){
-//                if (root.globaloptions.showWebsiteForLinks!="false"){showwebsiteCheckbox.checked=true}
-//            })
-  
-          }
-      catch (e){print(e)
+        })}
+        catch (e){print(e)
 //          Helperjs.friendicaWebRequest("https://dir.friendica.social/servers/surprise",accountPage,function(html){
 //              print(html);
 //              var bpos=html.indexOf("base ");
diff --git a/source-linux/qml/configqml/ConfigPage.qml b/source-linux/qml/configqml/ConfigPage.qml
index 7593d81..6b1cfa1 100644
--- a/source-linux/qml/configqml/ConfigPage.qml
+++ b/source-linux/qml/configqml/ConfigPage.qml
@@ -118,6 +118,25 @@ Page{
     }
 
 
+    CheckBox{
+        id: nsfwCheckbox
+        x: 4*mm
+        y: 33.5*mm
+        font.pixelSize: 3*mm
+        //width:5*mm
+        text: qsTr("Hide #nsfw?")
+        checked:(globaloptions["hide_nsfw"]==1)?true:false
+        onClicked: {
+            toggle();
+            if(nsfwCheckbox.checked==true){
+                Service.updateglobaloptions(root.db,"hide_nsfw",0);nsfwCheckbox.checked=false;
+            }
+            else{
+                Service.updateglobaloptions(root.db,"hide_nsfw",1);nsfwCheckbox.checked=true;
+            }
+        }
+    }
+
     Rectangle{color: "light grey"; x: 4*mm; y: 13.5*mm; width: 9*mm; height: 5*mm;
         radius: 0.5*mm
         TextEdit{id:maxNewsText;
@@ -132,7 +151,6 @@ Page{
             }
         }
     }
-
     Rectangle{
          x: 4*mm; y:23.5*mm; width: parent.width - 14*mm; height: 5*mm;
          color:"light grey"
diff --git a/source-linux/qml/configqml/RegisterPage.qml b/source-linux/qml/configqml/RegisterPage.qml
index 35ab326..097e2bc 100644
--- a/source-linux/qml/configqml/RegisterPage.qml
+++ b/source-linux/qml/configqml/RegisterPage.qml
@@ -38,29 +38,30 @@ Rectangle{
     color:"white"
     //border.color: "light grey"
     property alias url:htmlview.url
-    width:root.width-5*mm
-    height:root.height-12*mm
+//    width:root.width-5*mm
+//    height:root.height-12*mm
 
     WebView {id:htmlview;
         height:parent.height-7*mm
         width:parent.width
         y:7*mm
-        MouseArea {anchors.fill:parent;
-            onClicked:{
-                //print(url)
-            }
-        }
+//        MouseArea {
+//            anchors.fill:parent;
+//            onClicked:{
+//                //print(url)
+//            }
+//        }
         //onLoadingChanged: print(loadProgress)
     }
     Button{
         id:closeButton
-        height:8*mm
+        height:6*mm
         anchors.top: parent.top
         anchors.topMargin: 1*mm
         anchors.right: parent.right
         anchors.rightMargin: 1*mm
         text:   "\uf057"
         font.pixelSize: 3*mm
-        onClicked:{configStack.pop()}
+        onClicked:{root.pop()}
      }
 }
diff --git a/source-linux/qml/contactqml/FriendsTab.qml b/source-linux/qml/contactqml/FriendsTab.qml
index 41741e7..a054010 100644
--- a/source-linux/qml/contactqml/FriendsTab.qml
+++ b/source-linux/qml/contactqml/FriendsTab.qml
@@ -44,15 +44,21 @@ Rectangle {
     y:1
     color: "white"
 
+//    function showContactdetails(contact){
+//        var component = Qt.createComponent("qrc:/qml/contactqml/ContactDetailsComponent.qml");
+//        if(contact.isFriend){
+//            friendsTabView.currentIndex=1;
+//           var contactDetails = component.createObject(friendstab,{"contact": contact})
+//        }
+//        else{friendsTabView.currentIndex=2;
+//           var contactDetails = component.createObject(friendstab,{"contact": contact})
+//        }
+//    }
+
     function showContactdetails(contact){
-        var component = Qt.createComponent("qrc:/qml/contactqml/ContactDetailsComponent.qml");
-        if(contact.isFriend){
-            friendsTabView.currentIndex=1;
-           var contactDetails = component.createObject(friendstab,{"contact": contact})
-        }
-        else{friendsTabView.currentIndex=2;
-           var contactDetails = component.createObject(friendstab,{"contact": contact})
-        }
+        rootstack.currentIndex=0;
+        bar.currentIndex=0;
+        root.contactdetailsSignal(contact)
     }
 
     function showProfile(callback){
@@ -103,6 +109,7 @@ Rectangle {
         currentIndex: friendsbar.currentIndex
         signal contactsSignal(var contact)
         signal groupsSignal(var username)
+
         onCurrentIndexChanged:{
             if (currentIndex==1){
                 contactsSignal("")
@@ -147,6 +154,7 @@ Rectangle {
             Layout.fillWidth:true
             Layout.fillHeight: true
             property int currentContact: 0
+
             function showFriends(contact){
                 try {friendsModel.clear()} catch(e){print(e)};
                 Helperjs.readData(root.db,"contacts",login.username,function(friendsobject){
@@ -209,6 +217,7 @@ Rectangle {
               height:friendsGridTab.height-updateFriendsButton.height-2*mm
               clip: true
               spacing: 2
+              function processContactSelection(contactobject){showContactdetails(contactobject)}
               //add: Transition {
                //        NumberAnimation { properties: "x,y"; from: 300; duration: 1000 }
                //    }
@@ -269,6 +278,7 @@ Rectangle {
                  width:contactsGridTab.width-2*mm
                  height:contactsGridTab.height-cleanButton.height-2*mm
                  clip: true
+                 function processContactSelection(contactobject){showContactdetails(contactobject)}
                  //add: Transition {
                   //        NumberAnimation { properties: "x,y"; from: 300; duration: 1000 }
                   //    }
@@ -315,7 +325,7 @@ Rectangle {
             Connections{
                 target:xhr
                 onError:{print(data)}//if (data=="image"){Helperjs.showMessage()}}
-                onSuccess:{print("gruppe "+data);
+                onSuccess:{
                     Newsjs.requestGroups(root.login,root.db,root,function(){
                         showGroups(root.login.username)});
                 }
diff --git a/source-linux/qml/contactqml/GroupComponent.qml b/source-linux/qml/contactqml/GroupComponent.qml
index 4d33790..6659f01 100644
--- a/source-linux/qml/contactqml/GroupComponent.qml
+++ b/source-linux/qml/contactqml/GroupComponent.qml
@@ -116,7 +116,8 @@ Item {
                             if (userdata[0]){
                                 userdata[0].name=Qt.atob(userdata[0].name);
                                 userdata[0].description=Qt.atob(userdata[0].description)
-                                groupModel.append({"groupmember":userdata[0]
+                                //groupModel.append({"groupmember":userdata[0]
+                                groupModel.append({"contact":userdata[0]
                             })}
                         },"id",groupmembers[user])
                     } //catch(e){}
@@ -132,53 +133,53 @@ Item {
             anchors.topMargin: mm
             opacity: 0
 
-            Component {
-                id:groupMember
-                Rectangle{
-                    width:parent.width
-                    height:6*mm
-                    Rectangle{id:memberrectangle
-                        border.color: "#EEEEEE"
-                        border.width: 1
-                        width:parent.width-12*mm
-                        height:6*mm
-                        Image {
-                            id: memberImage
-                            x:1
-                            y:1
-                            width: 5*mm
-                            height:5*mm
-                            source:(groupmember.isFriend==1)? "file://"+groupmember.profile_image :groupmember.profile_image_url
-                            onStatusChanged: if (photoImage.status == Image.Error) {source="qrc:/images/defaultcontact.jpg"}
-                            }
-                        Text{
-                            font.pixelSize: 3*mm
-                            anchors.left: memberImage.right
-                            anchors.margins: 1*mm
-                            width:parent.width-1
-                            text:groupmember.name
-                        }
-                        MouseArea{
-                            anchors.fill: parent
-                            onClicked:{
-//                                root.currentIndex=1;
-//                                friendstab.active=true;
+//            Component {
+//                id:groupMember
+//                Rectangle{
+//                    width:parent.width
+//                    height:6*mm
+//                    Rectangle{id:memberrectangle
+//                        border.color: "#EEEEEE"
+//                        border.width: 1
+//                        width:parent.width-12*mm
+//                        height:6*mm
+//                        Image {
+//                            id: memberImage
+//                            x:1
+//                            y:1
+//                            width: 5*mm
+//                            height:5*mm
+//                            source:(groupmember.isFriend==1)? "file://"+groupmember.profile_image :groupmember.profile_image_url
+//                            onStatusChanged: if (photoImage.status == Image.Error) {source="qrc:/images/defaultcontact.jpg"}
+//                            }
+//                        Text{
+//                            font.pixelSize: 3*mm
+//                            anchors.left: memberImage.right
+//                            anchors.margins: 1*mm
+//                            width:parent.width-1
+//                            text:groupmember.name
+//                        }
+//                        MouseArea{
+//                            anchors.fill: parent
+//                            onClicked:{
+////                                root.currentIndex=1;
+////                                friendstab.active=true;
+////                                root.contactdetailsSignal(groupmember)
+//                                root.currentIndex=0;
 //                                root.contactdetailsSignal(groupmember)
-                                root.currentIndex=0;
-                                root.contactdetailsSignal(groupmember)
-                            }
-                        }
-                       // BlueButton{
-                       //     anchors.left: memberrectangle.right
-                       //     anchors.margins: 1*mm
-                       //     text: "\uf056"
-                       //     onClicked:{
-                       //         groupModel.remove(index)
-                       //     }
-                       // }
-                    }
-                }
-            }
+//                            }
+//                        }
+//                       // BlueButton{
+//                       //     anchors.left: memberrectangle.right
+//                       //     anchors.margins: 1*mm
+//                       //     text: "\uf056"
+//                       //     onClicked:{
+//                       //         groupModel.remove(index)
+//                       //     }
+//                       // }
+//                    }
+//                }
+//            }
 
             ListView{
                 id: groupListView
@@ -189,7 +190,8 @@ Item {
                 clip: true
                 spacing: 2
                 model: groupModel
-                delegate: groupMember
+                delegate: ContactComponent { }// groupMember
+                function processContactSelection(contactobject){showContactdetails(contactobject)}
             }
 
             ListModel{id: groupModel}
diff --git a/source-linux/qml/friendiqa.qml b/source-linux/qml/friendiqa.qml
index 034cd86..3d2d255 100644
--- a/source-linux/qml/friendiqa.qml
+++ b/source-linux/qml/friendiqa.qml
@@ -120,6 +120,7 @@ StackView{
                     })}
                 }
                 else if (newstab.conversation.length>0){newstab.conversation=[]}
+                else if (root.depth>1){root.pop()}
                 else{Service.cleanNews(root.db,function(){
                     Service.cleanContacts(root.login,root.db,function(){
                         Qt.quit()})
diff --git a/source-android/qml/contactqml/ContactComponent.qml b/source-linux/qml/genericqml/ContactComponent.qml
similarity index 93%
rename from source-android/qml/contactqml/ContactComponent.qml
rename to source-linux/qml/genericqml/ContactComponent.qml
index 3ddcb19..c2d687e 100644
--- a/source-android/qml/contactqml/ContactComponent.qml
+++ b/source-linux/qml/genericqml/ContactComponent.qml
@@ -83,9 +83,10 @@ Item {
         MouseArea{
             anchors.fill: parent
             onClicked:{
-                rootstack.currentIndex=0;
-                bar.currentIndex=0;
-                root.contactdetailsSignal(contact)
+                contactComponent.ListView.view.processContactSelection(contact)
+//                rootstack.currentIndex=0;
+//                bar.currentIndex=0;
+//                root.contactdetailsSignal(contact)
             }
         }
     }
diff --git a/source-linux/qml/newsqml/Conversation.qml b/source-linux/qml/newsqml/Conversation.qml
index c3fc24a..036d2ef 100644
--- a/source-linux/qml/newsqml/Conversation.qml
+++ b/source-linux/qml/newsqml/Conversation.qml
@@ -50,6 +50,7 @@ Rectangle {
 
    ListView {
           id: conversationView
+          property string viewtype: "conversation"
           x:3*mm
           y:8*mm
           width: conversationList.width-4*mm
diff --git a/source-linux/qml/newsqml/MessageSend.qml b/source-linux/qml/newsqml/MessageSend.qml
index 37b46a9..80cae44 100644
--- a/source-linux/qml/newsqml/MessageSend.qml
+++ b/source-linux/qml/newsqml/MessageSend.qml
@@ -47,6 +47,7 @@ Rectangle{
     id:messageSend
     visible:(newsSwipeview.stacktype!="Notifications")?true:false
     property string parentId: ""
+    property bool textfocus: false
     //property var parentObject:({})
     property bool conversation: false
     property string reply_to_user:""
@@ -55,21 +56,23 @@ Rectangle{
     //property int directmessage: 0;
     property var contacts: []
     property var groups: []
-    property var contact_allow:login.permissions[0]
-    property var contact_deny:login.permissions[1]
-    property var group_allow:login.permissions[2]
-    property var group_deny:login.permissions[3]
+    property var contact_allow:login.hasOwnProperty("permissions")?login.permissions[0]:[]
+    property var contact_deny:login.hasOwnProperty("permissions")?login.permissions[1]:[]
+    property var group_allow:login.hasOwnProperty("permissions")?login.permissions[2]:[]
+    property var group_deny:login.hasOwnProperty("permissions")?login.permissions[3]:[]
 
-    onReply_to_userChanged: {
-        if (reply_to_user!=""){
-            receiverLabel.visible=true
-         }
-    }
+//    onReply_to_userChanged: {
+//        if (reply_to_user!=""){
+//            print("reply "+reply_to_user)
+//            //receiverLabel.visible=true
+//            receiverLabel.text=reply_to_user
+//         }
+//    }
 
     function directmessagePrepare(friend){
         messageSend.state="active";
         reply_to_user=friend.screen_name;
-        receiverLabel.text=qsTr("to:")+ " "+ friend.screen_name;
+        receiverLabel.text=friend.screen_name;
     }
 
 
@@ -94,9 +97,10 @@ Rectangle{
 
 
     function attachImage(url){
-        var imageAttachmentObject=Qt.createQmlObject('import QtQuick 2.0; Image {id:imageAttachment'+attachImageURLs.length+'; source:"'+
-        url.toString()+'"; x:2*mm; width: 45*mm; height: 45*mm;fillMode: Image.PreserveAspectFit;MouseArea{anchors.fill:parent;onClicked:{attachImageURLs.splice(attachImageURLs.indexOf("'+
-        url+'"),1); imageAttachment'+attachImageURLs.length+'.destroy()}}}',messageColumn,"attachedImage");
+        imageAttachment.source=url.toString();
+//        var imageAttachmentObject=Qt.createQmlObject('import QtQuick 2.0; Image {id:imageAttachment'+attachImageURLs.length+'; source:"'+
+//        url.toString()+'"; x:2*mm; width: 45*mm; height: 45*mm;fillMode: Image.PreserveAspectFit;MouseArea{anchors.fill:parent;onClicked:{attachImageURLs.splice(attachImageURLs.indexOf("'+
+//        url+'"),1); imageAttachment'+attachImageURLs.length+'.destroy()}}}',messageColumn,"attachedImage");
     }
 
     function statusUpdate(title,status,in_reply_to_status_id,attachImageURL) {
@@ -114,7 +118,12 @@ Rectangle{
         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] )}};
+        if (attachImageURL.length>0) {
+            for (var image in attachImageURL){
+                xhr.setImageFileParam("media", attachImageURL[image]);
+                xhr.setImageFileParam("angle", rotator.angle.toString());
+            }
+        };
         xhr.post();
         }
 
@@ -137,35 +146,24 @@ Rectangle{
         if (newsitemobject!=""){
             messageSend.state="conversation"
             reply_to_user=newsitemobject.user.screen_name;
-            receiverLabel.text=qsTr("to:")+ " "+ newsitemobject.user.screen_name;
             parentId=newsitemobject.id
         } else {
             messageSend.state=""
             reply_to_user="";
-            receiverLabel.text=qsTr("to:");
             parentId="";
             bodyField.text="";
             attachImageURLs.pop();
-            try{imageAttachment.destroy()}catch(e){}
+            imageAttachment.source=""
         }
     }
 
     function contactmenu(letter){
         Newsjs.listFriends(login,db,function(contacts){
-            var contactitems="";
+            contactModel.clear();
             for (var i=0;i<contacts.length;i++){
-                if(Helperjs.getCount(db,login,"contacts","screen_name",contacts[i].screen_name)>1){
-                    contacts[i].screen_name=contacts[i].screen_name+"+"+contacts[i].cid
-                }
-                contactitems=contactitems+"MenuItem{text:'"+contacts[i].screen_name+
-                    "'; onTriggered:{if (newsSwipeview.stacktype=='DirectMessages'){reply_to_user='"+
-                    contacts[i].screen_name+"'} else {bodyField.insert("+
-                    bodyField.cursorPosition+",' "+contacts[i].screen_name.substring(1)+" ');bodyField.cursorPosition=bodyField.cursorPosition+"+contacts[i].screen_name.length+"}}}"
-            //}
+                contactModel.append({"contact":contacts[i]})
             }
-            var menuString="import QtQuick.Controls 2.4; Menu {width:40*mm; font.pixelSize: 3*mm; "+contactitems+"}";
-            var contactlistObject=Qt.createQmlObject(menuString,messageColumn,"contactmenuOutput");
-            if (contacts.length>0){contactlistObject.popup()}
+            contactSelector.visible=true
             },letter);
     }
 //    Flickable{
@@ -179,18 +177,47 @@ Rectangle{
             spacing: 0.5*mm
             width: parent.width
             height: 10*mm//implicitHeight
-            Label{
-                id:receiverLabel
-                x: 0.5*mm
-                width: parent.width-mm
-                font.pixelSize: 3*mm
-                text: newsSwipeview.stacktype=="DirectMessages"?qsTr("to:")+ " "+ reply_to_user:""
-                visible:false// ((parentId !== "") || (newsStack.parent.stacktype=="DirectMessages"))
-                MouseArea{
-                    anchors.fill: parent
-                    onClicked:{}
+
+//            Row{
+//                x: 0.5*mm
+//                Label{
+//                    id:toLabel
+//                    width: 7*mm
+//                    height: 6*mm
+//                    topPadding: 1.5* mm
+//                    font.pixelSize: 3*mm
+//                    text: newsSwipeview.stacktype=="DirectMessages"?qsTr("to:"):""
+//                    visible:false// ((parentId !== "") || (newsStack.parent.stacktype=="DirectMessages"))
+//                }
+                TextArea{
+                    id:receiverLabel
+                    //x: 8*mm
+                    width: messageColumn.width//-8*mm
+                    font.pixelSize: 3*mm
+                    placeholderText:qsTr("to:")
+                    text: ""//newsSwipeview.stacktype=="DirectMessages"?qsTr("to:")+ " "+ reply_to_user:""
+                    visible:false// ((parentId !== "") || (newsStack.parent.stacktype=="DirectMessages"))
+                    //onLengthChanged: contactmenu(text)
+                    //onPreeditTextChanged: contactmenu(text)
+//                    onActiveFocusChanged:{
+//                        if (activeFocus==true){contactmenu("")}
+//                    }
+                    onTextChanged: {
+                        //print (text)
+                        contactmenu(text)}
+    //                MouseArea{
+    //                    anchors.fill: parent
+    //                    onClicked:{print("receiverlabel")
+    //                        if(newsSwipeview.stacktype=="DirectMessages"){
+    //                        contactmenu();
+
+    //                        }}
+    //                }
                 }
-            }
+    //        }
+
+
+
             TextField {
                  id: titleField
                  x: 0.5*mm
@@ -203,16 +230,16 @@ Rectangle{
                  }
               }
 
-
-
            Rectangle{
                color: "white"
                radius: 0.5*mm
                x:mm
                width: parent.width-2*mm
                height:Math.max(bodyField.contentHeight+4*mm,10*mm)
+
                TextArea {
                     id: bodyField
+                    property string contactprefix:""
                     anchors.fill: parent
                     font.pixelSize: 3*mm
                     font.family: "Noto Sans"
@@ -226,26 +253,103 @@ Rectangle{
                         if (activeFocus==true){
                             if (conversation==true){
                                 setParent(conversationModel.get(0).newsitemobject);
-                                messageSend.state="conversation"
-                            } else{
-                                messageSend.state="active"
+                                messageSend.state="conversation";
+                                conversationView.contentY=conversationView.contentY+20*mm
+                            } else  if (textfocus==false){
+                                messageSend.state="active";
+                                newsView.positionViewAtBeginning();
                             }
                         }
                     }
                     onTextChanged:{
                         if (text!=""){
-                        //print(getText(bodyField.cursorPosition-2,bodyField.cursorPosition) +" preedit: "+ preeditText+cursorPosition);
-                        var regex1 = /@[a-z]/;var regex2 = /![a-z]/;
-                        //print(text.substring(cursorPosition-2,cursorPosition));
-                        //if (regex.test(getText(bodyField.cursorPosition-2,bodyField.cursorPosition)) || regex.test(preeditText) || regex.test(text)){
-                        if (regex1.test(getText(bodyField.cursorPosition-2,bodyField.cursorPosition)+preeditText) || regex2.test(getText(bodyField.cursorPosition-2,bodyField.cursorPosition)+preeditText)){
-                            var letter=(getText(bodyField.cursorPosition-2,bodyField.cursorPosition)).match(/[a-z]/);
-                            contactmenu(letter)
-                        }
-                    }}
+                            var plaintext=getText(0,cursorPosition)
+                            //print(plaintext+plaintext.lastIndexOf("@",cursorPosition)+getText(plaintext.lastIndexOf('@',cursorPosition),cursorPosition) +" preedit: "+ preeditText+cursorPosition);
+                            var regex1 = /@[a-z]+/;var regex2 = /![a-z]+/;var regex3 = /\s/;
+                            //print(text.substring(cursorPosition-2,cursorPosition));
+                            //if (regex.test(getText(bodyField.cursorPosition-2,bodyField.cursorPosition)) || regex.test(preeditText) || regex.test(text)){
+                            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:8*mm
+               width: parent.width-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}
+
+
+           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}
+
+               }
+               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{
 //                spacing: 2
@@ -341,13 +445,16 @@ Rectangle{
                    width: 7*mm
                    text: "\uf057"
                    onClicked: {
-                       bodyField.text="";
-                       messageSend.state="";
-                       permissionDialog.visible=false;
-                       receiverLabel.visible=false;
-                       reply_to_user="";
-                       attachImage("");
-                       attachImageURLs.pop();
+                       if (textfocus==true){messageSend.destroy()}
+                       else{
+                           bodyField.text="";
+                           messageSend.state="";
+                           permissionDialog.visible=false;
+                           receiverLabel.visible=false;
+                           reply_to_user="";
+                           attachImage("");
+                           attachImageURLs.pop();
+                       }
                    }
                }
                MButton {
@@ -382,6 +489,7 @@ Rectangle{
             root.directmessageSignal.connect(directmessagePrepare);
             root.uploadSignal.connect(sendUrls);
             root.sendtextSignal.connect(sendtext);
+            if (textfocus==true){bodyField.forceActiveFocus()}
             }
 
         states: [ State {
@@ -398,6 +506,9 @@ Rectangle{
             PropertyChanges {
                 target: receiverLabel; visible:(newsSwipeview.stacktype=="DirectMessages");
             }
+//            PropertyChanges {
+//                target: toLabel; visible:(newsSwipeview.stacktype=="DirectMessages");
+//            }
         },
         State {
             name: "conversation"
@@ -422,6 +533,23 @@ Rectangle{
 //            PropertyChanges {
 //                target: messageSend; parentId: conversationModel.get(0).newsitemobject.status_id
 //            }
-        } ]
+        },
+
+            State {
+                name: "reply"
+                PropertyChanges {
+                    target: messageColumn; height: implicitHeight
+                }
+                PropertyChanges {
+                    target: buttonRow; visible:true
+                }
+                PropertyChanges {
+                    target: titleField; visible:false
+                }
+                PropertyChanges {
+                    target: bodyField; placeholderText:"";focus:true
+                }
+            }
+        ]
 }
 //}
diff --git a/source-linux/qml/newsqml/NewsStack.qml b/source-linux/qml/newsqml/NewsStack.qml
index 5cf9d95..b987ce3 100644
--- a/source-linux/qml/newsqml/NewsStack.qml
+++ b/source-linux/qml/newsqml/NewsStack.qml
@@ -152,7 +152,40 @@ StackView{
        newsView.anchors.topMargin=mm
    }
 
-   Connections{
+    function getOldNews(){
+        var currentTime= new Date();
+        try{var lastnews_id=newsModel.get(newsModel.count-1).newsitemobject.created_at;} catch(e){var lastnews_id=99999999999999 }
+         var messagetype=0;
+         switch(newsSwipeview.stacktype){
+             case "Home":messagetype=0;break;
+             case "DirectMessages": messagetype=1;break;
+             case "Notifications":messagetype=2;break;
+             case "Replies":messagetype=3;break;
+             default:messagetype=0;
+         }
+        if(newstab.newstabstatus=="Timeline"){
+            Newsjs.newsfromdb(root.db,root.login, messagetype,function(news){
+                var msg = {'currentTime': currentTime, 'model': newsModel,'news':news,'appendnews':true, 'options':globaloptions};
+                newsWorker.sendMessage(msg);
+            },false,lastnews_id)}
+        if(newstab.newstabstatus=="Conversations"){
+            Newsjs.chatsfromdb(root.db,root.login, messagetype,function(news){
+                var msg = {'currentTime': currentTime, 'model': newsModel,'news':news,'appendnews':true, 'options':globaloptions};
+                newsWorker.sendMessage(msg);
+            },lastnews_id)}
+//                        else if(newstab.newstabstatus=="Contact"){
+//                            Newsjs.newsfromdb(root.db,root.login, function(news){
+//                                var msg = {'currentTime': currentTime, 'model': newsModel,'news':news,'appendnews':true};
+//                                newsWorker.sendMessage(msg);
+//                            },newsModel.get(newsModel.count-1).newsitemobject.uid,lastnews_id)}
+        else if (newstab.newstabstatus=="Notifications"){}
+        else{
+            //newsStack.appendNews=true;
+            try{xhr.setParam("max_id",newsModel.get(newsModel.count-1).newsitemobject.id-1);}catch(e){}
+            xhr.get()
+        }
+    }
+    Connections{
        target:xhr
        onError:{
            Helperjs.showMessage(qsTr("Network Error"),"API:\n" +login.server+api+"\n Return: \n"+data,root);
@@ -375,39 +408,11 @@ StackView{
                      anchors.centerIn: parent
                      text:qsTr("More")
                  }
-                 MouseArea{anchors.fill:parent
+                 MouseArea{
+                     anchors.fill:parent
                      onClicked:{
-                        var currentTime= new Date();
-                        var lastnews_id=newsModel.get(newsModel.count-1).newsitemobject.created_at;
-                         var messagetype=0;
-                         switch(newsSwipeview.stacktype){
-                             case "Home":messagetype=0;break;
-                             case "DirectMessages": messagetype=1;break;
-                             case "Notifications":messagetype=2;break;
-                             case "Replies":messagetype=3;break;
-                             default:messagetype=0;
-                         }
-                        if(newstab.newstabstatus=="Timeline"){
-                            Newsjs.newsfromdb(root.db,root.login, messagetype,function(news){
-                                var msg = {'currentTime': currentTime, 'model': newsModel,'news':news,'appendnews':true, 'options':globaloptions};
-                                newsWorker.sendMessage(msg);
-                            },false,lastnews_id)}
-                        if(newstab.newstabstatus=="Conversations"){
-                            Newsjs.chatsfromdb(root.db,root.login, messagetype,function(news){
-                                var msg = {'currentTime': currentTime, 'model': newsModel,'news':news,'appendnews':true, 'options':globaloptions};
-                                newsWorker.sendMessage(msg);
-                            },lastnews_id)}
-//                        else if(newstab.newstabstatus=="Contact"){
-//                            Newsjs.newsfromdb(root.db,root.login, function(news){
-//                                var msg = {'currentTime': currentTime, 'model': newsModel,'news':news,'appendnews':true};
-//                                newsWorker.sendMessage(msg);
-//                            },newsModel.get(newsModel.count-1).newsitemobject.uid,lastnews_id)}
-                        else if (newstab.newstabstatus=="Notifications"){}
-                        else{
-                            //newsStack.appendNews=true;
-                            xhr.setParam("max_id",newsModel.get(newsModel.count-1).newsitemobject.id-1);
-                            xhr.get()
-                     }}
+                        getOldNews();
+                     }
                  }
              }
         }
@@ -425,6 +430,8 @@ StackView{
           id: newsView
           property real oldContentY:0
           property bool viewdragged: false
+          property bool viewdraggedpositive: false
+          property string viewtype: "news"
           anchors.fill: parent
           anchors.margins: mm
           //anchors.topMargin: 6*mm
@@ -440,7 +447,10 @@ StackView{
           onDragEnded: {
               if(verticalOvershoot<-5*mm){
                 viewdragged=true
-            }
+              }
+              else if (verticalOvershoot>5*mm){
+                viewdraggedpositive=true
+              }
               else{
                 if((contentY-oldContentY)>15*mm){
                     swipeIndicator.visible=false;
@@ -460,24 +470,25 @@ StackView{
               if (viewdragged){
                   var onlynew=true;
                   newsBusy.running=true;
+                  viewdragged=false
                   if (newstab.newstabstatus=="Timeline"){
                       newsStack.updateMethodNews="append"
                   } else {newsStack.updateMethodNews="refresh"}
                 //root.contactLoadType="news";
-                    if (newsSwipeview.stacktype=="Home"){
-                        Newsjs.getLastNews(root.login,root.db,function(currentlastnews){
-                            if (currentlastnews>lastnewsid){
-                                if(newstab.newstabstatus=="Timeline"){
-                                    try{ Newsjs.newsfromdb(root.db,root.login,0, function(dbnews,lastid){
-                                        lastnewsid=lastid;
-                                        showNews(dbnews)
-                                    })}catch(e){Helperjs.showMessage("Error",e,root)};
-                                }
-                                if(newstab.newstabstatus=="Conversations"){
-                                    Newsjs.chatsfromdb(db,root.login,0,function(news,lastid){
-                                        lastnewsid=lastid;
-                                        showNews(news)});
-                                }
+                  if (newsSwipeview.stacktype=="Home"){
+                      Newsjs.getLastNews(root.login,root.db,function(currentlastnews){
+                          if (currentlastnews>lastnewsid){
+                              if(newstab.newstabstatus=="Timeline"){
+                                  try{ Newsjs.newsfromdb(root.db,root.login,0, function(dbnews,lastid){
+                                      lastnewsid=lastid;
+                                      showNews(dbnews)
+                                  })}catch(e){Helperjs.showMessage("Error",e,root)};
+                              }
+                              if(newstab.newstabstatus=="Conversations"){
+                                  Newsjs.chatsfromdb(db,root.login,0,function(news,lastid){
+                                      lastnewsid=lastid;
+                                      showNews(news)});
+                              }
                             }  else {
                                 Service.updateView(newstab.newstabstatus)
                             }
@@ -492,9 +503,16 @@ StackView{
                 else if (newsSwipeview.stacktype=="Replies"){
                     Service.updateView("Replies")
                 }
-                    viewdragged=false
-              }}
+
+              }
           }
+          onViewdraggedpositiveChanged: {
+              if (viewdraggedpositive){
+                getOldNews();
+                viewdraggedpositive=false
+              }
+          }
+       }
           
        ListModel{id: newsModel}
 
@@ -554,7 +572,7 @@ StackView{
 //                showNews(root.news)
 //            }
             //else{
-            newstab.newstabstatus=login.newsViewType;
+            login.hasOwnProperty("newsViewType")?newstab.newstabstatus=login.newsViewType:"Conversations"
             var messagetype=0;
             switch(newsSwipeview.stacktype){
                 case "Home":messagetype=0;break;
diff --git a/source-linux/qml/newsqml/NewsTab.qml b/source-linux/qml/newsqml/NewsTab.qml
index 248bee5..98b3010 100644
--- a/source-linux/qml/newsqml/NewsTab.qml
+++ b/source-linux/qml/newsqml/NewsTab.qml
@@ -59,10 +59,8 @@ Item {
 //    }
 
 
-
-
     Timer {id:contacttimer; interval: 50; running: false; repeat: false
-        onTriggered: {//print("Contacttimer "+JSON.stringify(root.news));
+        onTriggered: {
            // downloadNotice.text=downloadNotice.text + "\n contactTimer start "+ Date.now()
             root.newContacts=Newsjs.findNewContacts(root.news,root.contactlist);
             Newsjs.storeNews(login,db,root.news,root)
diff --git a/source-linux/qml/newsqml/NewsVideo.qml b/source-linux/qml/newsqml/NewsVideo.qml
index cce6012..c58620c 100644
--- a/source-linux/qml/newsqml/NewsVideo.qml
+++ b/source-linux/qml/newsqml/NewsVideo.qml
@@ -29,63 +29,39 @@
 //  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 QtMultimedia 5.8
 import QtQuick 2.9
-import QtQuick.Controls 1.4
-import QtQuick.Controls.Styles 1.4
+//import QtQuick.Controls 2.4
+//import QtQuick.Controls.Styles 1.4
 
 Rectangle{
     color:"black"
     //border.color: "light grey"
-    width:newscolumn.width;
-    height:newscolumn.width/4*3//video.hasVideo?newscolumn.width/4*3:10*mm
-    property alias source:video.source
+    width:newscolumn.width/2;
+    height:newscolumn.width/3//video.hasVideo?newscolumn.width/4*3:10*mm
+    property var attachment:({})
     Text{
         id:noticeText
         text:"\uf144";
         color:"light grey"
         width:parent.width
         font.pixelSize: parent.height/2
-        x:parent.width/2-parent.height/4
+        x: (parent.width-contentWidth)/2
         y:parent.height/5
-        visible: video.playbackState!=MediaPlayer.PlayingState
+        //visible: video.playbackState!=MediaPlayer.PlayingState
     }
 
-    Video {id:video;
-        anchors.fill:parent
-        property string mimetype:""
-        onErrorChanged:{noticeText.font.pixelSize=3*mm;noticeText.text=errorString}
-        fillMode: Image.PreserveAspectFit;
-        autoLoad: false
-        audioRole: MediaPlayer.VideoRole
-        MouseArea {anchors.fill:parent;
-            onClicked:{if(video.playbackState!=MediaPlayer.PlayingState){
-               video.play()} else{video.pause()}
+    MouseArea {anchors.fill:parent;
+        onClicked:{
+            if(attachment.mimetype=="video/youtube"){
+                    var component = Qt.createComponent("qrc:/qml/newsqml/NewsYplayer.qml");
+                    var videoQml = component.createObject(root,{"ytcode":attachment.url,"mimetype":attachment.mimetype});
+            } else {
+                var component = Qt.createComponent("qrc:/qml/newsqml/NewsVideoLarge.qml");
+                var videoQml = component.createObject(root,{"source": attachment.url,"mimetype": attachment.mimetype});
             }
         }
     }
-    ProgressBar{
-                id: videoProgress
-                width: parent.width
-                height: 2*mm
-                anchors.top: video.bottom
-                z:2
-                visible:video.playbackState!=MediaPlayer.StoppedState
-                value: video.position/video.duration
-            }
-    ProgressBar{
-                id: videoBuffer
-                width: parent.width
-                height: 2*mm
-                anchors.top: video.bottom
-                visible:video.playbackState!=MediaPlayer.StoppedState
-                value: video.bufferProgress
-                style:ProgressBarStyle{
-                    progress: Rectangle{
-                        color:"light grey"
-                    }
-                }
-            }
 //            Slider{ id: videoSlider
 //                width: parent.width
 //                height: 3*mm
diff --git a/source-android/qml/newsqml/NewsVideo.qml b/source-linux/qml/newsqml/NewsVideoLarge.qml
similarity index 67%
rename from source-android/qml/newsqml/NewsVideo.qml
rename to source-linux/qml/newsqml/NewsVideoLarge.qml
index cce6012..8aba428 100644
--- a/source-android/qml/newsqml/NewsVideo.qml
+++ b/source-linux/qml/newsqml/NewsVideoLarge.qml
@@ -31,21 +31,23 @@
 
 import QtMultimedia 5.8
 import QtQuick 2.9
-import QtQuick.Controls 1.4
-import QtQuick.Controls.Styles 1.4
+import QtQuick.Controls 2.4
+//import QtQuick.Controls.Styles 1.4
 
 Rectangle{
+    id:newsvideofullscreen
     color:"black"
     //border.color: "light grey"
-    width:newscolumn.width;
-    height:newscolumn.width/4*3//video.hasVideo?newscolumn.width/4*3:10*mm
+    width:root.width;
+    height:root.height
     property alias source:video.source
     Text{
         id:noticeText
-        text:"\uf144";
+        text:""
         color:"light grey"
-        width:parent.width
-        font.pixelSize: parent.height/2
+        width:parent.width/2
+        wrapMode: Text.Wrap
+        font.pixelSize: 3*mm
         x:parent.width/2-parent.height/4
         y:parent.height/5
         visible: video.playbackState!=MediaPlayer.PlayingState
@@ -54,38 +56,50 @@ Rectangle{
     Video {id:video;
         anchors.fill:parent
         property string mimetype:""
-        onErrorChanged:{noticeText.font.pixelSize=3*mm;noticeText.text=errorString}
+        onErrorChanged:{noticeText.font.pixelSize=3*mm;noticeText.text=errorString;}
         fillMode: Image.PreserveAspectFit;
-        autoLoad: false
+        autoLoad: true
+        autoPlay: true
         audioRole: MediaPlayer.VideoRole
-        MouseArea {anchors.fill:parent;
-            onClicked:{if(video.playbackState!=MediaPlayer.PlayingState){
-               video.play()} else{video.pause()}
+        MouseArea {
+            anchors.fill:parent;
+            onClicked:{
+                newsvideofullscreen.destroy();
             }
         }
     }
+
     ProgressBar{
-                id: videoProgress
-                width: parent.width
-                height: 2*mm
-                anchors.top: video.bottom
-                z:2
-                visible:video.playbackState!=MediaPlayer.StoppedState
-                value: video.position/video.duration
-            }
-    ProgressBar{
-                id: videoBuffer
-                width: parent.width
-                height: 2*mm
-                anchors.top: video.bottom
-                visible:video.playbackState!=MediaPlayer.StoppedState
-                value: video.bufferProgress
-                style:ProgressBarStyle{
-                    progress: Rectangle{
-                        color:"light grey"
-                    }
+        id: videoProgress
+        width: parent.width
+        height: 2*mm
+        anchors.bottom: video.bottom
+        z:2
+        visible:video.playbackState!=MediaPlayer.StoppedState
+        value: video.position/video.duration
+        MouseArea {
+            anchors.fill:parent;
+            onClicked:{
+                if(video.playbackState!=MediaPlayer.PlayingState){
+                    video.play()} else{video.pause()
                 }
             }
+        }
+    }
+
+    ProgressBar{
+        id: videoBuffer
+        width: parent.width
+        height: 2*mm
+        anchors.bottom: video.bottom
+        visible:video.playbackState!=MediaPlayer.StoppedState
+        value: video.bufferProgress
+//        style:ProgressBarStyle{
+//            progress: Rectangle{
+//                color:"light grey"
+//            }
+//        }
+    }
 //            Slider{ id: videoSlider
 //                width: parent.width
 //                height: 3*mm
diff --git a/source-linux/qml/newsqml/NewsYplayer.qml b/source-linux/qml/newsqml/NewsYplayer.qml
index 11d01c2..7b8614b 100644
--- a/source-linux/qml/newsqml/NewsYplayer.qml
+++ b/source-linux/qml/newsqml/NewsYplayer.qml
@@ -33,19 +33,23 @@
 
 import QtQuick 2.8
 import "qrc:/js/helper.js" as Helperjs
-//import QtWebView 1.1
+import QtWebView 1.1
 
 Rectangle{
-    color:"transparent"
-    width:newscolumn.width;
-    height:newscolumn.width/4*3
-    property string url:""//htmlview.text
+    id:newsYplayer
+    color:"black"
+    width:root.width;
+    height:root.height
+    property string url:""
+    property string ytcode:""
+
     WebView {
         id: webView
         anchors.fill: parent
+        z:1
         opacity: 0
 
-        url: "qrc:///content/player.html?" + currentVideo.vId
+        url: root.osSettings.osType=="Android"?"https://youtube.com/watch?v="+ytcode:"qrc:/js/yplayer.html?" + ytcode
 
         Behavior on opacity { NumberAnimation { duration: 200 } }
 
@@ -59,42 +63,13 @@ Rectangle{
             case WebView.LoadStoppedStatus:
                 break
             case WebView.LoadFailedStatus:
-                topInfo.text = "Failed to load the requested video"
+                print("Failed to load the requested video" + url)
                 break
             }
             opacity = 0
         }
         onTitleChanged: {
-            currentVideo.status = 1 * title
-            if (title == videoStatus.paused || title == videoStatus.ready)
-                panel.state = "list"
-            else if (title == videoStatus.playing)
-                panel.state = "hidden"
+            if (title==2){newsYplayer.destroy()}
         }
     }
-    Text{id:htmlview
-        textFormat:Text.RichText
-    }
-//    WebView {id:htmlview;
-//        anchors.fill: parent
-//    }
-    Component.onCompleted:{
-
-//        Helperjs.friendicaWebRequest(url,parent,function(document){
-//            print(document);
-
-////            var metas = document.getElementsByTagName('meta'); //get all the meta tag elements
-////        //iterate through them
-////        for (i=0; i<metas.length; i++) {
-////           if (metas[i].getAttribute("name") == "keywords") {
-////             print(metas[i].getAttribute("content"));
-////           }
-////          else if (metas[i].getAttribute("name") == "description") {
-////             console.log(metas[i].getAttribute("content"));
-////           }
-////        }
-//        //print(html);
-//        htmlview.text=""
-//        })
-    }
 }
diff --git a/source-linux/qml/newsqml/Newsitem.qml b/source-linux/qml/newsqml/Newsitem.qml
index 8dabc67..b44629f 100644
--- a/source-linux/qml/newsqml/Newsitem.qml
+++ b/source-linux/qml/newsqml/Newsitem.qml
@@ -147,7 +147,7 @@ Item {
              width:parent.width
              spacing:mm
              clip:true
-             height: Math.min(implicitHeight,3/4*root.height)
+             height: newsitemobject.nsfw?5*mm:Math.min(implicitHeight,3/4*root.height)
         MouseArea{
             width: newsitem.width-8*mm-2
             height: itemMessage.height
@@ -188,9 +188,10 @@ Item {
                             var component = Qt.createComponent("qrc:/qml/newsqml/NewsLink.qml");
                             var linkQml = component.createObject(messageColumn,{"url":newsitemobject.attachmentList[attachments].url});
                         }
-                        else {//print(newsitemobject.attachmentList[attachments].url+" Type: "+newsitemobject.attachmentList[attachments].mimetype)
+                        else {
                             var component = Qt.createComponent("qrc:/qml/newsqml/NewsVideo.qml");
-                            var videoQml = component.createObject(messageColumn,{"source":newsitemobject.attachmentList[attachments].url,"mimetype":newsitemobject.attachmentList[attachments].mimetype});
+                            //var videoQml = component.createObject(messageColumn,{"source":newsitemobject.attachmentList[attachments].url,"mimetype":newsitemobject.attachmentList[attachments].mimetype});
+                            var videoQml = component.createObject(messageColumn,{"attachment":newsitemobject.attachmentList[attachments]});
                         }
                     }
                 }
@@ -201,7 +202,7 @@ Item {
               width: newsitem.width-8*mm-2
               height:5*mm
               //anchors.bottom: messageColumn.bottom//itemMessage.bottom
-              visible: messageColumn.implicitHeight>3/4*root.height//itemMessage.implicitHeight>3/4*root.height
+              visible: messageColumn.implicitHeight>3/4*root.height || newsitemobject.nsfw//itemMessage.implicitHeight>3/4*root.height
               text:"\uf078"
               fontColor:"grey"
               border.color: "transparent"
@@ -412,7 +413,10 @@ Item {
             onTriggered: {
                 var directmessage=0;
                 if (newsitemobject.messagetype==1){ directmessage=1}
-                replySignal(newsitemobject)
+                var replycomp=Qt.createComponent("qrc:/qml/newsqml/MessageSend.qml");
+                var conversation;newsitem.ListView.view.viewtype=="conversation"?true:false;
+                var reply=replycomp.createObject(friendicaActivities,{parentId:newsitemobject.id,reply_to_user:newsitemobject.user.screen_name, state:"reply",conversation:conversation,textfocus:true})
+                //replySignal(newsitemobject)
                 //newsStack.push("qrc:/qml/newsqml/MessageSend.qml",{"reply_to_user": newsitemobject.user.screen_name,"parentId":newsitemobject.id,"login":root.login,"directmessage":directmessage});
             }
         }
diff --git a/source-linux/qml/photoqml/ImageUploadDialog.qml b/source-linux/qml/photoqml/ImageUploadDialog.qml
index 9302135..1bf85e1 100644
--- a/source-linux/qml/photoqml/ImageUploadDialog.qml
+++ b/source-linux/qml/photoqml/ImageUploadDialog.qml
@@ -254,8 +254,22 @@ function updateImage(){
         y: 10*mm
         width: root.width/2;
         height: 5*mm;
+        font.pixelSize: 3*mm
         editable:true
         model: albumModel
+
+//        delegate: ItemDelegate {
+//            width: album.width
+//            contentItem: Text {
+//                //text: modelData
+//                color: "white"
+//                font: album.font
+//                font.pixelSize: album.font.pixelSize
+//                elide: Text.ElideRight
+//                verticalAlignment: Text.AlignVCenter
+//            }
+//            //highlighted: album.highlightedIndex === index
+//        }
         onAccepted: {
             if (find(currentText) === -1) {
                 albumModel.append({text: editText})
diff --git a/source-linux/qml/photoqml/PhotoTab.qml b/source-linux/qml/photoqml/PhotoTab.qml
index 7c54269..9de38af 100644
--- a/source-linux/qml/photoqml/PhotoTab.qml
+++ b/source-linux/qml/photoqml/PhotoTab.qml
@@ -116,7 +116,7 @@ StackView{
         else{
             try {photogroupModel.clear()}catch (e){print(e)}
             if (friend){
-                  Imagejs.newRequestFriendsAlbumPictures(root.login,friend,fotorectangle,function(albums,remoteAuthBool){
+                  Imagejs.newRequestFriendsAlbumPictures(login,friend,fotorectangle,function(albums,remoteAuthBool){
                     remoteContact=remoteAuthBool;
                     var msg = {'model': photogroupModel,'albums':albums,'firstalbum':0,'foreignPicture':true,'friend':friend}
                     photoWorker.sendMessage(msg);
@@ -125,7 +125,7 @@ StackView{
 
             }
             else {
-                Helperjs.readField("album", root.db, "imageData",login.username,function(albums){
+                Helperjs.readField("album", db, "imageData",login.username,function(albums){
                     if (albums[0]) {
                         var msg = { 'model': photogroupModel,'albums':albums,'firstalbum':0,'foreignPicture': false};
                         photoWorker.sendMessage(msg);
@@ -261,7 +261,7 @@ StackView{
                 text:qsTr("More")
             }
             MouseArea{anchors.fill:parent
-                onClicked:{print(photogroupModel.get(0).foreignPicture);
+                onClicked:{//print(photogroupModel.get(0).foreignPicture);
                     var lastalbum_id=photogroupModel.count-1;
                     if(photogroupModel.get(photogroupModel.count-1).foreignPicture==true){
                         Imagejs.newRequestFriendsAlbumPictures(login,photogroupModel.get(0).friend,fotorectangle,function(albums,remoteAuthBool){
diff --git a/source-linux/qtquickcontrols2.conf b/source-linux/qtquickcontrols2.conf
index 3222ebf..15e32c4 100644
--- a/source-linux/qtquickcontrols2.conf
+++ b/source-linux/qtquickcontrols2.conf
@@ -1,6 +1,10 @@
 [Controls]
 Style=Material
 
+[Default]
+Font\Family=Noto Sans
+Font\PointSize=20
+
 [Universal]
 Theme=System
 Accent=Red