diff --git a/k9mail/src/main/AndroidManifest.xml b/k9mail/src/main/AndroidManifest.xml
index ca890d986..6e19e7360 100644
--- a/k9mail/src/main/AndroidManifest.xml
+++ b/k9mail/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest
     package="com.fsck.k9"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="23050"
-    android:versionName="5.105">
+    android:versionCode="23060"
+    android:versionName="5.106">
 
     <uses-feature
         android:name="android.hardware.touchscreen"
diff --git a/k9mail/src/main/java/com/fsck/k9/view/RigidWebView.java b/k9mail/src/main/java/com/fsck/k9/view/RigidWebView.java
index 2031648b7..43e344ba5 100644
--- a/k9mail/src/main/java/com/fsck/k9/view/RigidWebView.java
+++ b/k9mail/src/main/java/com/fsck/k9/view/RigidWebView.java
@@ -18,6 +18,7 @@
 package com.fsck.k9.view;
 
 import android.content.Context;
+import android.os.Build;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.webkit.WebView;
@@ -34,6 +35,7 @@ import com.fsck.k9.helper.Utility;
  * contents with percent-based height will force the WebView to infinitely expand (or shrink).
  */
 public class RigidWebView extends WebView {
+    private static final boolean NO_THROTTLE = Build.VERSION.SDK_INT >= 21; //Build.VERSION_CODES.LOLLIPOP
 
     public RigidWebView(Context context) {
         super(context);
@@ -64,8 +66,14 @@ public class RigidWebView extends WebView {
 
     @Override
     protected void onSizeChanged(int w, int h, int ow, int oh) {
+        if (NO_THROTTLE) {
+            super.onSizeChanged(w, h, ow, oh);
+            return;
+        }
+
         mRealWidth = w;
         mRealHeight = h;
+
         long now = mClock.getTime();
         boolean recentlySized = (now - mLastSizeChangeTime < MIN_RESIZE_INTERVAL);
 
diff --git a/k9mail/src/main/res/xml/changelog_master.xml b/k9mail/src/main/res/xml/changelog_master.xml
index 1b3e0f69c..cc6946a6e 100644
--- a/k9mail/src/main/res/xml/changelog_master.xml
+++ b/k9mail/src/main/res/xml/changelog_master.xml
@@ -8,6 +8,9 @@
      They are automatically updated with "ant bump-version".
 -->
 <changelog>
+    <release version="5.106" versioncode="23060">
+        <change>Fixed a bug where messages where not always displayed on Android 5.x</change>
+    </release>
     <release version="5.105" versioncode="23050">
         <change>Reverted all changes introduced with v5.104 except for the bugfixes related to Android 5.1</change>
     </release>