From ee1288ee7562094be0acb5f355403641113b6960 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Mon, 18 Jun 2012 03:17:02 +0200
Subject: [PATCH] Disable special screen reader mode on ICS

The default message view is accessible enough.
Info and original patch provided by Nolan Darilek.

See issue 4153
---
 src/com/fsck/k9/view/SingleMessageView.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/fsck/k9/view/SingleMessageView.java b/src/com/fsck/k9/view/SingleMessageView.java
index 31df37bc2..019f866db 100644
--- a/src/com/fsck/k9/view/SingleMessageView.java
+++ b/src/com/fsck/k9/view/SingleMessageView.java
@@ -8,6 +8,7 @@ import android.content.pm.ResolveInfo;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.util.AttributeSet;
@@ -140,7 +141,9 @@ public class SingleMessageView extends LinearLayout implements OnClickListener,
         mDownloadRemainder = (Button) findViewById(R.id.download_remainder);
         mDownloadRemainder.setVisibility(View.GONE);
         mAttachmentsContainer.setVisibility(View.GONE);
-        if (isScreenReaderActive(activity)) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH &&
+                isScreenReaderActive(activity)) {
+            // Only use the special screen reader mode on pre-ICS devices with active screen reader
             mAccessibleMessageContentView.setVisibility(View.VISIBLE);
             mMessageContentView.setVisibility(View.GONE);
             mScreenReaderEnabled = true;