diff --git a/res/xml/battery_saver_settings.xml b/res/xml/battery_saver_settings.xml
index 929053f..cb923c8 100644
--- a/res/xml/battery_saver_settings.xml
+++ b/res/xml/battery_saver_settings.xml
@@ -25,7 +25,7 @@
             android:persistent="false" />
 
     <!-- Feature description text -->
-    <Preference
+    <com.android.settings.fuelgauge.WallOfTextPreference
             android:key="description"
             android:summary="@*android:string/battery_saver_description"
             android:persistent="false"
diff --git a/src/com/android/settings/fuelgauge/WallOfTextPreference.java b/src/com/android/settings/fuelgauge/WallOfTextPreference.java
new file mode 100644
index 0000000..5577206
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/WallOfTextPreference.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.fuelgauge;
+
+import android.content.Context;
+import android.preference.Preference;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.TextView;
+
+public class WallOfTextPreference extends Preference {
+
+    public WallOfTextPreference(Context context) {
+        super(context);
+    }
+
+    public WallOfTextPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public WallOfTextPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public WallOfTextPreference(Context context, AttributeSet attrs, int defStyleAttr,
+            int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+        final TextView summary = (TextView) view.findViewById(android.R.id.summary);
+        summary.setMaxLines(20);
+    }
+}
\ No newline at end of file
