diff -Nru owncloud-client-2.1.1+dfsg/debian/changelog owncloud-client-2.1.1+dfsg/debian/changelog
--- owncloud-client-2.1.1+dfsg/debian/changelog	2016-04-12 08:13:32.000000000 +0000
+++ owncloud-client-2.1.1+dfsg/debian/changelog	2016-04-28 17:39:40.000000000 +0000
@@ -1,3 +1,10 @@
+owncloud-client (2.1.1+dfsg-1ubuntu1.1) xenial; urgency=medium
+
+  * workaround-systemtray-bug.diff: Don't call isSystemTrayAvailable, it
+    hides the systemtray. (LP: #1573639)
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 28 Apr 2016 20:30:38 +0300
+
 owncloud-client (2.1.1+dfsg-1ubuntu1) xenial; urgency=medium
 
   * Sync from Debian (LP: #1515731)
diff -Nru owncloud-client-2.1.1+dfsg/debian/patches/series owncloud-client-2.1.1+dfsg/debian/patches/series
--- owncloud-client-2.1.1+dfsg/debian/patches/series	2016-02-17 09:55:13.000000000 +0000
+++ owncloud-client-2.1.1+dfsg/debian/patches/series	2016-04-28 17:29:13.000000000 +0000
@@ -6,3 +6,4 @@
 0006-move-configfile.patch
 0007-move-translations.patch
 0008-make-reproducable.patch
+workaround-systemtray-bug.diff
diff -Nru owncloud-client-2.1.1+dfsg/debian/patches/workaround-systemtray-bug.diff owncloud-client-2.1.1+dfsg/debian/patches/workaround-systemtray-bug.diff
--- owncloud-client-2.1.1+dfsg/debian/patches/workaround-systemtray-bug.diff	1970-01-01 00:00:00.000000000 +0000
+++ owncloud-client-2.1.1+dfsg/debian/patches/workaround-systemtray-bug.diff	2016-04-28 17:23:18.000000000 +0000
@@ -0,0 +1,31 @@
+diff --git a/src/gui/main.cpp b/src/gui/main.cpp
+index ff5434a..1a13d1f 100644
+--- a/src/gui/main.cpp
++++ b/src/gui/main.cpp
+@@ -127,8 +127,17 @@ int main(int argc, char **argv)
+             return -1;
+         }
+         return 0;
+-    } else {
++    }
++#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
++    if (qgetenv("QT_QPA_PLATFORMTHEME") != "appmenu-qt5")
++        // We can't call isSystemTrayAvailable with appmenu-qt5 begause it hides the systemtray
++        // (issue #4693)
++#endif
++    {
+         if (!QSystemTrayIcon::isSystemTrayAvailable()) {
++            // If the systemtray is not there, we will wait one second for it to maybe start
++            // (eg boot time) then we show the settings dialog if there is still no systemtray.
++            // On XFCE however, we show a message box with explainaition how to install a systemtray.
+             Utility::sleep(1);
+             auto desktopSession = qgetenv("XDG_CURRENT_DESKTOP").toLower();
+             if (desktopSession.isEmpty()) {
+@@ -152,6 +161,7 @@ int main(int argc, char **argv)
+             }
+         }
+     }
++
+     return app.exec();
+ }
+