diff --git a/mobile/AndroidManifest.xml b/mobile/AndroidManifest.xml
index 10f69ab0..a4528ae7 100644
--- a/mobile/AndroidManifest.xml
+++ b/mobile/AndroidManifest.xml
@@ -23,7 +23,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
         <activity
-            android:name="com.cradle.iitc_mobile.IITC_Mobile"
+            android:name=".IITC_Mobile"
             android:configChanges="orientation|keyboard|keyboardHidden|screenSize"
             android:label="@string/app_name"
             android:launchMode="singleTop"
@@ -89,11 +89,11 @@
             android:name=".share.ShareActivity"
             android:label="@string/activity_share"
             android:noHistory="true"
-            android:parentActivityName="com.cradle.iitc_mobile.IITC_Mobile"
+            android:parentActivityName=".IITC_Mobile"
             android:theme="@android:style/Theme.Holo.Light.DarkActionBar">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.cradle.iitc_mobile.IITC_Mobile"/>
+                android:value=".IITC_Mobile"/>
         </activity>
 
         <activity
@@ -136,7 +136,7 @@
         <!-- Points to searchable activity so the whole app can invoke search. -->
         <meta-data
             android:name="android.app.default_searchable"
-            android:value="com.cradle.iitc_mobile.IITC_Mobile"/>
+            android:value=".IITC_Mobile"/>
     </application>
 
 </manifest>
diff --git a/mobile/src/com/cradle/iitc_mobile/share/IntentListView.java b/mobile/src/com/cradle/iitc_mobile/share/IntentListView.java
index 621f023c..235701bf 100644
--- a/mobile/src/com/cradle/iitc_mobile/share/IntentListView.java
+++ b/mobile/src/com/cradle/iitc_mobile/share/IntentListView.java
@@ -152,11 +152,19 @@ public class IntentListView extends ListView {
                 ResolveInfo info = activityList.get(i);
                 ActivityInfo activity = info.activityInfo;
 
+                // fix bug in PackageManager - a replaced package name might cause non-exported intents to appear
+                if (activity.exported == false && !activity.packageName.equals(packageName)) {
+                    activityList.remove(i);
+                    i--;
+                    continue;
+                }
+
                 // remove all IITCm intents, except for SendToClipboard in case Drive is not installed
                 if (activity.packageName.equals(packageName)) {
                     if (hasCopyIntent || !activity.name.equals(SendToClipboard.class.getCanonicalName())) {
                         activityList.remove(i);
                         i--;
+                        continue;
                     }
                 }
             }