diff --git a/app/src/main/java/eu/faircode/email/Widget.java b/app/src/main/java/eu/faircode/email/Widget.java
index de79373b8f..1d830675dd 100644
--- a/app/src/main/java/eu/faircode/email/Widget.java
+++ b/app/src/main/java/eu/faircode/email/Widget.java
@@ -111,7 +111,7 @@ public class Widget extends AppWidgetProvider {
                     RemoteViews views = new RemoteViews(context.getPackageName(),
                             layout == 0 ? R.layout.widget : R.layout.widget_new);
 
-                    views.setOnClickPendingIntent(R.id.widget, pi);
+                    views.setOnClickPendingIntent(android.R.id.background, pi);
 
                     if (layout == 1)
                         views.setImageViewResource(R.id.ivMessage, unseen == 0
@@ -131,9 +131,9 @@ public class Widget extends AppWidgetProvider {
 
                     if (background == Color.TRANSPARENT) {
                         if (semi)
-                            views.setInt(R.id.widget, "setBackgroundResource", R.drawable.widget_background);
+                            views.setInt(android.R.id.background, "setBackgroundResource", R.drawable.widget_background);
                         else
-                            views.setInt(R.id.widget, "setBackgroundColor", background);
+                            views.setInt(android.R.id.background, "setBackgroundColor", background);
 
                         int colorWidgetForeground = context.getResources().getColor(R.color.colorWidgetForeground);
                         views.setInt(R.id.ivMessage, "setColorFilter", colorWidgetForeground);
@@ -145,7 +145,7 @@ public class Widget extends AppWidgetProvider {
                         if (semi)
                             background = ColorUtils.setAlphaComponent(background, 127);
 
-                        views.setInt(R.id.widget, "setBackgroundColor", background);
+                        views.setInt(android.R.id.background, "setBackgroundColor", background);
 
                         if (lum > 0.7f) {
                             views.setInt(R.id.ivMessage, "setColorFilter", Color.BLACK);
@@ -155,7 +155,7 @@ public class Widget extends AppWidgetProvider {
                     }
 
                     int pad = Helper.dp2pixels(context, layout == 0 ? 3 : 6);
-                    views.setViewPadding(R.id.widget, pad, pad, pad, pad);
+                    views.setViewPadding(R.id.content, pad, pad, pad, pad);
 
                     appWidgetManager.updateAppWidget(appWidgetId, views);
                 }
diff --git a/app/src/main/java/eu/faircode/email/WidgetSync.java b/app/src/main/java/eu/faircode/email/WidgetSync.java
index c229b705d8..d1eb4a3886 100644
--- a/app/src/main/java/eu/faircode/email/WidgetSync.java
+++ b/app/src/main/java/eu/faircode/email/WidgetSync.java
@@ -59,9 +59,9 @@ public class WidgetSync extends AppWidgetProvider {
 
                 if (background == Color.TRANSPARENT) {
                     if (semi)
-                        views.setInt(R.id.widget, "setBackgroundResource", R.drawable.widget_background);
+                        views.setInt(android.R.id.background, "setBackgroundResource", R.drawable.widget_background);
                     else
-                        views.setInt(R.id.widget, "setBackgroundColor", background);
+                        views.setInt(android.R.id.background, "setBackgroundColor", background);
                     views.setInt(R.id.ivSync, "setColorFilter",
                             context.getResources().getColor(R.color.colorWidgetForeground));
                 } else {
@@ -70,14 +70,14 @@ public class WidgetSync extends AppWidgetProvider {
                     if (semi)
                         background = ColorUtils.setAlphaComponent(background, 127);
 
-                    views.setInt(R.id.widget, "setBackgroundColor", background);
+                    views.setInt(android.R.id.background, "setBackgroundColor", background);
 
                     if (lum > 0.7f)
                         views.setInt(R.id.ivSync, "setColorFilter", Color.BLACK);
                 }
 
                 int dp6 = Helper.dp2pixels(context, 6);
-                views.setViewPadding(R.id.widget, dp6, dp6, dp6, dp6);
+                views.setViewPadding(R.id.content, dp6, dp6, dp6, dp6);
 
                 appWidgetManager.updateAppWidget(appWidgetId, views);
             }
diff --git a/app/src/main/java/eu/faircode/email/WidgetUnified.java b/app/src/main/java/eu/faircode/email/WidgetUnified.java
index a5742f6869..3bb1c15924 100644
--- a/app/src/main/java/eu/faircode/email/WidgetUnified.java
+++ b/app/src/main/java/eu/faircode/email/WidgetUnified.java
@@ -133,9 +133,9 @@ public class WidgetUnified extends AppWidgetProvider {
 
             if (background == Color.TRANSPARENT) {
                 if (semi)
-                    views.setInt(R.id.widget, "setBackgroundResource", R.drawable.widget_background);
+                    views.setInt(android.R.id.background, "setBackgroundResource", R.drawable.widget_background);
                 else
-                    views.setInt(R.id.widget, "setBackgroundColor", background);
+                    views.setInt(android.R.id.background, "setBackgroundColor", background);
 
                 int colorWidgetForeground = context.getResources().getColor(R.color.colorWidgetForeground);
                 views.setTextColor(R.id.title, colorWidgetForeground);
@@ -145,14 +145,14 @@ public class WidgetUnified extends AppWidgetProvider {
                 if (semi)
                     background = ColorUtils.setAlphaComponent(background, 127);
 
-                views.setInt(R.id.widget, "setBackgroundColor", background);
+                views.setInt(android.R.id.background, "setBackgroundColor", background);
 
                 if (lum > 0.7f)
                     views.setTextColor(R.id.title, Color.BLACK);
             }
 
             int dp6 = Helper.dp2pixels(context, 6);
-            views.setViewPadding(R.id.widget, dp6, 0, dp6, 0);
+            views.setViewPadding(R.id.content, dp6, 0, dp6, 0);
 
             appWidgetManager.updateAppWidget(appWidgetId, views);
             appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetIds, R.id.lv);
diff --git a/app/src/main/res/layout/widget.xml b/app/src/main/res/layout/widget.xml
index b9f4d8892d..902fe9ee6b 100644
--- a/app/src/main/res/layout/widget.xml
+++ b/app/src/main/res/layout/widget.xml
@@ -1,49 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/widget"
+    android:id="@android:id/background"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/widget_background"
-    android:orientation="vertical"
-    android:padding="3dp">
+    android:background="@drawable/widget_background">
 
-    <ImageView
-        android:id="@+id/ivMessage"
-        android:layout_width="24dp"
-        android:layout_height="0dp"
-        android:layout_gravity="center_horizontal"
-        android:layout_weight="2"
-        android:contentDescription="@string/title_legend_count"
-        android:src="@drawable/baseline_mail_24"
-        app:tint="@color/colorWidgetForeground" />
+    <LinearLayout
+        android:id="@+id/content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:padding="3dp">
 
-    <TextView
-        android:id="@+id/tvCount"
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_gravity="center_horizontal"
-        android:layout_weight="2"
-        android:includeFontPadding="false"
-        android:lines="1"
-        android:text="\?"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-        android:textColor="@color/colorWidgetForeground"
-        android:textSize="18dp"
-        android:textStyle="bold" />
+        <ImageView
+            android:id="@+id/ivMessage"
+            android:layout_width="24dp"
+            android:layout_height="0dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_weight="2"
+            android:contentDescription="@string/title_legend_count"
+            android:src="@drawable/baseline_mail_24"
+            app:tint="@color/colorWidgetForeground" />
 
-    <TextView
-        android:id="@+id/tvAccount"
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_gravity="center_horizontal"
-        android:layout_weight="1"
-        android:ellipsize="end"
-        android:includeFontPadding="false"
-        android:lines="1"
-        android:text="account"
-        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-        android:textColor="@color/colorWidgetForeground"
-        android:textSize="12dp"
-        android:visibility="gone" />
-</LinearLayout>
+        <TextView
+            android:id="@+id/tvCount"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_weight="2"
+            android:includeFontPadding="false"
+            android:lines="1"
+            android:text="\?"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            android:textColor="@color/colorWidgetForeground"
+            android:textSize="18dp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/tvAccount"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_weight="1"
+            android:ellipsize="end"
+            android:includeFontPadding="false"
+            android:lines="1"
+            android:text="account"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textColor="@color/colorWidgetForeground"
+            android:textSize="12dp"
+            android:visibility="gone" />
+    </LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/widget_new.xml b/app/src/main/res/layout/widget_new.xml
index 1144c0ccc9..873cab7daf 100644
--- a/app/src/main/res/layout/widget_new.xml
+++ b/app/src/main/res/layout/widget_new.xml
@@ -1,52 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/widget"
+    android:id="@android:id/background"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/widget_background"
-    android:padding="6dp">
+    android:background="@drawable/widget_background">
 
-    <ImageView
-        android:id="@+id/ivMessage"
+    <RelativeLayout
+        android:id="@+id/content"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:adjustViewBounds="true"
-        android:contentDescription="@string/title_legend_count"
-        android:padding="3dp"
-        android:scaleType="fitXY"
-        android:src="@drawable/baseline_mail_widget_24"
-        app:tint="@color/colorWidgetForeground" />
+        android:padding="6dp">
 
-    <TextView
-        android:id="@+id/tvCount"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignEnd="@id/ivMessage"
-        android:layout_alignBottom="@id/ivMessage"
-        android:background="@drawable/widget_background_unread"
-        android:includeFontPadding="false"
-        android:lines="1"
-        android:paddingStart="3dp"
-        android:paddingEnd="3dp"
-        android:text="\?"
-        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-        android:textColor="@color/colorWidgetForeground"
-        android:textSize="12dp"
-        android:textStyle="bold" />
+        <ImageView
+            android:id="@+id/ivMessage"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:adjustViewBounds="true"
+            android:contentDescription="@string/title_legend_count"
+            android:padding="3dp"
+            android:scaleType="fitXY"
+            android:src="@drawable/baseline_mail_widget_24"
+            app:tint="@color/colorWidgetForeground" />
 
-    <TextView
-        android:id="@+id/tvAccount"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/ivMessage"
-        android:ellipsize="end"
-        android:gravity="center_horizontal"
-        android:includeFontPadding="false"
-        android:lines="1"
-        android:text="account"
-        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-        android:textColor="@color/colorWidgetForeground"
-        android:textSize="12dp"
-        android:visibility="gone" />
-</RelativeLayout>
+        <TextView
+            android:id="@+id/tvCount"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignEnd="@id/ivMessage"
+            android:layout_alignBottom="@id/ivMessage"
+            android:background="@drawable/widget_background_unread"
+            android:includeFontPadding="false"
+            android:lines="1"
+            android:paddingStart="3dp"
+            android:paddingEnd="3dp"
+            android:text="\?"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textColor="@color/colorWidgetForeground"
+            android:textSize="12dp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/tvAccount"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/ivMessage"
+            android:ellipsize="end"
+            android:gravity="center_horizontal"
+            android:includeFontPadding="false"
+            android:lines="1"
+            android:text="account"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textColor="@color/colorWidgetForeground"
+            android:textSize="12dp"
+            android:visibility="gone" />
+    </RelativeLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/widget_sync.xml b/app/src/main/res/layout/widget_sync.xml
index f60e65d87e..91e76061ff 100644
--- a/app/src/main/res/layout/widget_sync.xml
+++ b/app/src/main/res/layout/widget_sync.xml
@@ -1,19 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/widget"
+    android:id="@android:id/background"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/widget_background"
-    android:padding="6dp">
+    android:background="@drawable/widget_background">
 
-    <ImageView
-        android:id="@+id/ivSync"
+    <RelativeLayout
+        android:id="@+id/content"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:adjustViewBounds="true"
-        android:contentDescription="@string/title_widget_title_sync"
-        android:scaleType="fitXY"
-        android:src="@drawable/twotone_sync_disabled_24"
-        app:tint="@color/colorWidgetForeground" />
-</RelativeLayout>
+        android:padding="6dp">
+
+        <ImageView
+            android:id="@+id/ivSync"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:adjustViewBounds="true"
+            android:contentDescription="@string/title_widget_title_sync"
+            android:scaleType="fitXY"
+            android:src="@drawable/twotone_sync_disabled_24"
+            app:tint="@color/colorWidgetForeground" />
+    </RelativeLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/widget_unified.xml b/app/src/main/res/layout/widget_unified.xml
index 36e3f597dd..d8588fbfd0 100644
--- a/app/src/main/res/layout/widget_unified.xml
+++ b/app/src/main/res/layout/widget_unified.xml
@@ -1,65 +1,71 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/widget"
+    android:id="@android:id/background"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/widget_background"
-    android:orientation="vertical"
-    android:paddingStart="6dp"
-    android:paddingEnd="6dp">
+    android:background="@drawable/widget_background">
 
     <LinearLayout
+        android:id="@+id/content"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:paddingStart="6dp"
+        android:paddingEnd="6dp">
 
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="0dp"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:padding="6dp"
-            android:text="@string/title_widget_title_list"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            android:textColor="@color/colorWidgetForeground"
-            android:textStyle="bold" />
+            android:orientation="horizontal">
 
-        <ImageView
-            android:id="@+id/refresh"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:contentDescription="@string/tile_synchronize"
-            android:padding="6dp"
-            android:src="@drawable/twotone_sync_24"
-            android:visibility="gone"
-            app:tint="@color/colorWidgetForeground" />
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:padding="6dp"
+                android:text="@string/title_widget_title_list"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                android:textColor="@color/colorWidgetForeground"
+                android:textStyle="bold" />
 
-        <ImageView
-            android:id="@+id/compose"
-            android:layout_width="wrap_content"
+            <ImageView
+                android:id="@+id/refresh"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0"
+                android:contentDescription="@string/tile_synchronize"
+                android:padding="6dp"
+                android:src="@drawable/twotone_sync_24"
+                android:visibility="gone"
+                app:tint="@color/colorWidgetForeground" />
+
+            <ImageView
+                android:id="@+id/compose"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0"
+                android:contentDescription="@string/title_compose"
+                android:padding="6dp"
+                android:src="@drawable/twotone_edit_24"
+                android:visibility="gone"
+                app:tint="@color/colorWidgetForeground" />
+        </LinearLayout>
+
+        <FrameLayout
+            android:id="@+id/separator"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/colorWidgetRead" />
+
+        <ListView
+            android:id="@+id/lv"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:contentDescription="@string/title_compose"
-            android:padding="6dp"
-            android:src="@drawable/twotone_edit_24"
-            android:visibility="gone"
-            app:tint="@color/colorWidgetForeground" />
+            android:layout_marginBottom="6dp"
+            android:divider="@color/colorWidgetRead"
+            android:dividerHeight="1dp" />
     </LinearLayout>
-
-    <FrameLayout
-        android:id="@+id/separator"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/colorWidgetRead" />
-
-    <ListView
-        android:id="@+id/lv"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="6dp"
-        android:divider="@color/colorWidgetRead"
-        android:dividerHeight="1dp" />
-</LinearLayout>
+</FrameLayout>
\ No newline at end of file