diff --git a/core/java/android/content/pm/PackageItemInfo.java b/core/java/android/content/pm/PackageItemInfo.java
index 0e5ce3fa7e6cb..d666263183b91 100644
--- a/core/java/android/content/pm/PackageItemInfo.java
+++ b/core/java/android/content/pm/PackageItemInfo.java
@@ -78,9 +78,11 @@ public class PackageItemInfo {
 
     public PackageItemInfo(PackageItemInfo orig) {
         name = orig.name;
+        if (name != null) name = name.trim();
         packageName = orig.packageName;
         labelRes = orig.labelRes;
         nonLocalizedLabel = orig.nonLocalizedLabel;
+        if (nonLocalizedLabel != null) nonLocalizedLabel = nonLocalizedLabel.toString().trim();
         icon = orig.icon;
         metaData = orig.metaData;
     }
@@ -103,10 +105,10 @@ public class PackageItemInfo {
         if (labelRes != 0) {
             CharSequence label = pm.getText(packageName, labelRes, null);
             if (label != null) {
-                return label;
+                return label.toString().trim();
             }
         }
-        if(name != null) {
+        if (name != null) {
             return name;
         }
         return packageName;
diff --git a/core/java/android/content/pm/ResolveInfo.java b/core/java/android/content/pm/ResolveInfo.java
index b6f4acc385dde..a35940f6dc965 100644
--- a/core/java/android/content/pm/ResolveInfo.java
+++ b/core/java/android/content/pm/ResolveInfo.java
@@ -133,7 +133,7 @@ public class ResolveInfo implements Parcelable {
         if (resolvePackageName != null && labelRes != 0) {
             label = pm.getText(resolvePackageName, labelRes, null);
             if (label != null) {
-                return label;
+                return label.toString().trim();
             }
         }
         ComponentInfo ci = activityInfo != null ? activityInfo : serviceInfo;
@@ -141,10 +141,14 @@ public class ResolveInfo implements Parcelable {
         if (labelRes != 0) {
             label = pm.getText(ci.packageName, labelRes, ai);
             if (label != null) {
-                return label;
+                return label.toString().trim();
             }
         }
-        return ci.loadLabel(pm);
+
+        CharSequence data = ci.loadLabel(pm);
+        // Make the data safe
+        if (data != null) data = data.toString().trim();
+        return data;
     }
     
     /**
diff --git a/core/res/res/layout/resolve_list_item.xml b/core/res/res/layout/resolve_list_item.xml
index 6ed43de8fd983..caa82d495204a 100644
--- a/core/res/res/layout/resolve_list_item.xml
+++ b/core/res/res/layout/resolve_list_item.xml
@@ -42,12 +42,14 @@
             android:textAppearance="?android:attr/textAppearanceLargeInverse"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:maxLines="2"
             android:paddingLeft="10dip" />
         <!-- Extended activity info to distinguish between duplicate activity names -->
         <TextView android:id="@android:id/text2"
             android:textAppearance="?android:attr/textAppearanceMediumInverse"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:maxLines="2"
             android:paddingLeft="10dip" />
     </LinearLayout>
 </LinearLayout>