diff --git a/Classes/BITFeedbackActivity.m b/Classes/BITFeedbackActivity.m
index 2bfa0f3087..2dd581eff0 100644
--- a/Classes/BITFeedbackActivity.m
+++ b/Classes/BITFeedbackActivity.m
@@ -20,8 +20,10 @@
 }
 
 - (NSString *)activityTitle {
-  NSString *appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"];
-
+  NSString *appName = [[[NSBundle mainBundle] localizedInfoDictionary] objectForKey:@"CFBundleDisplayName"];
+  if (!appName)
+    appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"] ?: BITHockeyLocalizedString(@"HockeyFeedbackActivityAppPlaceholder");
+  
   return [NSString stringWithFormat:BITHockeyLocalizedString(@"HockeyFeedbackActivityButtonTitle"), appName];
 }
 
diff --git a/Resources/de.lproj/HockeySDK.strings b/Resources/de.lproj/HockeySDK.strings
index b4d6290169..10752150a0 100755
--- a/Resources/de.lproj/HockeySDK.strings
+++ b/Resources/de.lproj/HockeySDK.strings
@@ -188,6 +188,9 @@
 /* Activity Sharing Button Title, App Name will be inserted */
 "HockeyFeedbackActivityButtonTitle" = "%@ Feedback";
 
+/* if there can no app name be found, use this instead for HockeyFeedbackActivityButtonTitle */
+"HockeyFeedbackActivityAppPlaceholder" = "App";
+
 
 /* Compose Message */
 
diff --git a/Resources/en.lproj/HockeySDK.strings b/Resources/en.lproj/HockeySDK.strings
index c42969d49f..5d8d491e2b 100755
--- a/Resources/en.lproj/HockeySDK.strings
+++ b/Resources/en.lproj/HockeySDK.strings
@@ -185,6 +185,9 @@
 /* Activity Sharing Button Title, App Name will be inserted */
 "HockeyFeedbackActivityButtonTitle" = "%@ Feedback";
 
+/* if there can no app name be found, use this instead for HockeyFeedbackActivityButtonTitle */
+"HockeyFeedbackActivityAppPlaceholder" = "App";
+
 
 /* Compose Message */
 
diff --git a/Resources/es.lproj/HockeySDK.strings b/Resources/es.lproj/HockeySDK.strings
index 061a454927..0b77a04f72 100755
--- a/Resources/es.lproj/HockeySDK.strings
+++ b/Resources/es.lproj/HockeySDK.strings
@@ -186,6 +186,9 @@
 /* Activity Sharing Button Title, App Name will be inserted */
 "HockeyFeedbackActivityButtonTitle" = "%@ Feedback";
 
+/* if there can no app name be found, use this instead for HockeyFeedbackActivityButtonTitle */
+"HockeyFeedbackActivityAppPlaceholder" = "App";
+
 
 /* Compose Message */
 
diff --git a/Resources/fr.lproj/HockeySDK.strings b/Resources/fr.lproj/HockeySDK.strings
index 051b70a752..03544f3632 100755
--- a/Resources/fr.lproj/HockeySDK.strings
+++ b/Resources/fr.lproj/HockeySDK.strings
@@ -186,6 +186,9 @@
 /* Activity Sharing Button Title, App Name will be inserted */
 "HockeyFeedbackActivityButtonTitle" = "%@ Feedback";
 
+/* if there can no app name be found, use this instead for HockeyFeedbackActivityButtonTitle */
+"HockeyFeedbackActivityAppPlaceholder" = "App";
+
 
 /* Compose Message */
 
diff --git a/Resources/it.lproj/HockeySDK.strings b/Resources/it.lproj/HockeySDK.strings
index aa33045aaa..eb59079b5d 100755
--- a/Resources/it.lproj/HockeySDK.strings
+++ b/Resources/it.lproj/HockeySDK.strings
@@ -186,6 +186,9 @@
 /* Activity Sharing Button Title, App Name will be inserted */
 "HockeyFeedbackActivityButtonTitle" = "%@ Feedback";
 
+/* if there can no app name be found, use this instead for HockeyFeedbackActivityButtonTitle */
+"HockeyFeedbackActivityAppPlaceholder" = "App";
+
 
 /* Compose Message */
 
diff --git a/Resources/ja.lproj/HockeySDK.strings b/Resources/ja.lproj/HockeySDK.strings
index 935f5d416d..b9d77d1e26 100755
--- a/Resources/ja.lproj/HockeySDK.strings
+++ b/Resources/ja.lproj/HockeySDK.strings
@@ -186,6 +186,9 @@
 /* Activity Sharing Button Title, App Name will be inserted */
 "HockeyFeedbackActivityButtonTitle" = "%@ Feedback";
 
+/* if there can no app name be found, use this instead for HockeyFeedbackActivityButtonTitle */
+"HockeyFeedbackActivityAppPlaceholder" = "App";
+
 
 /* Compose Message */
 
diff --git a/Resources/nl.lproj/HockeySDK.strings b/Resources/nl.lproj/HockeySDK.strings
index 6c50710821..b88870c418 100755
--- a/Resources/nl.lproj/HockeySDK.strings
+++ b/Resources/nl.lproj/HockeySDK.strings
@@ -186,6 +186,9 @@
 /* Activity Sharing Button Title, App Name will be inserted */
 "HockeyFeedbackActivityButtonTitle" = "%@ Feedback";
 
+/* if there can no app name be found, use this instead for HockeyFeedbackActivityButtonTitle */
+"HockeyFeedbackActivityAppPlaceholder" = "App";
+
 
 /* Compose Message */
 
diff --git a/Resources/pt-PT.lproj/HockeySDK.strings b/Resources/pt-PT.lproj/HockeySDK.strings
index decaa4babd..0d10b8355b 100755
--- a/Resources/pt-PT.lproj/HockeySDK.strings
+++ b/Resources/pt-PT.lproj/HockeySDK.strings
@@ -186,6 +186,9 @@
 /* Activity Sharing Button Title, App Name will be inserted */
 "HockeyFeedbackActivityButtonTitle" = "%@ Feedback";
 
+/* if there can no app name be found, use this instead for HockeyFeedbackActivityButtonTitle */
+"HockeyFeedbackActivityAppPlaceholder" = "App";
+
 
 /* Compose Message */
 
diff --git a/Resources/pt.lproj/HockeySDK.strings b/Resources/pt.lproj/HockeySDK.strings
index 3a1b4e5d0d..4e42872a64 100755
--- a/Resources/pt.lproj/HockeySDK.strings
+++ b/Resources/pt.lproj/HockeySDK.strings
@@ -186,6 +186,9 @@
 /* Activity Sharing Button Title, App Name will be inserted */
 "HockeyFeedbackActivityButtonTitle" = "%@ Feedback";
 
+/* if there can no app name be found, use this instead for HockeyFeedbackActivityButtonTitle */
+"HockeyFeedbackActivityAppPlaceholder" = "App";
+
 
 /* Compose Message */
 
diff --git a/Resources/ru.lproj/HockeySDK.strings b/Resources/ru.lproj/HockeySDK.strings
index e09737e683..844b7b30ce 100755
--- a/Resources/ru.lproj/HockeySDK.strings
+++ b/Resources/ru.lproj/HockeySDK.strings
@@ -186,6 +186,9 @@
 /* Activity Sharing Button Title, App Name will be inserted */
 "HockeyFeedbackActivityButtonTitle" = "%@ Feedback";
 
+/* if there can no app name be found, use this instead for HockeyFeedbackActivityButtonTitle */
+"HockeyFeedbackActivityAppPlaceholder" = "App";
+
 
 /* Compose Message */
 
diff --git a/Resources/sv.lproj/HockeySDK.strings b/Resources/sv.lproj/HockeySDK.strings
index b646e6d94b..e49649d0c1 100755
--- a/Resources/sv.lproj/HockeySDK.strings
+++ b/Resources/sv.lproj/HockeySDK.strings
@@ -186,6 +186,9 @@
 /* Activity Sharing Button Title, App Name will be inserted */
 "HockeyFeedbackActivityButtonTitle" = "%@ Feedback";
 
+/* if there can no app name be found, use this instead for HockeyFeedbackActivityButtonTitle */
+"HockeyFeedbackActivityAppPlaceholder" = "App";
+
 
 /* Compose Message */
 
diff --git a/Resources/tr.lproj/HockeySDK.strings b/Resources/tr.lproj/HockeySDK.strings
index a0747e7d02..59c489e82e 100644
--- a/Resources/tr.lproj/HockeySDK.strings
+++ b/Resources/tr.lproj/HockeySDK.strings
@@ -186,6 +186,9 @@
 /* Activity Sharing Button Title, App Name will be inserted */
 "HockeyFeedbackActivityButtonTitle" = "%@ Feedback";
 
+/* if there can no app name be found, use this instead for HockeyFeedbackActivityButtonTitle */
+"HockeyFeedbackActivityAppPlaceholder" = "App";
+
 
 /* Compose Message */
 
diff --git a/Resources/zh_CN.lproj/HockeySDK.strings b/Resources/zh_CN.lproj/HockeySDK.strings
index a8b77cdba4..a2def09f85 100644
--- a/Resources/zh_CN.lproj/HockeySDK.strings
+++ b/Resources/zh_CN.lproj/HockeySDK.strings
@@ -186,6 +186,9 @@
 /* Activity Sharing Button Title, App Name will be inserted */
 "HockeyFeedbackActivityButtonTitle" = "%@ Feedback";
 
+/* if there can no app name be found, use this instead for HockeyFeedbackActivityButtonTitle */
+"HockeyFeedbackActivityAppPlaceholder" = "App";
+
 
 /* Compose Message */
 
diff --git a/Resources/zh_TW.lproj/HockeySDK.strings b/Resources/zh_TW.lproj/HockeySDK.strings
index 38ac41ad21..1caa729ba9 100644
--- a/Resources/zh_TW.lproj/HockeySDK.strings
+++ b/Resources/zh_TW.lproj/HockeySDK.strings
@@ -186,6 +186,9 @@
 /* Activity Sharing Button Title, App Name will be inserted */
 "HockeyFeedbackActivityButtonTitle" = "%@ Feedback";
 
+/* if there can no app name be found, use this instead for HockeyFeedbackActivityButtonTitle */
+"HockeyFeedbackActivityAppPlaceholder" = "App";
+
 
 /* Compose Message */