diff --git a/Classes/BITFeedbackListViewController.h b/Classes/BITFeedbackListViewController.h
index c77a480879..6e39fa1662 100644
--- a/Classes/BITFeedbackListViewController.h
+++ b/Classes/BITFeedbackListViewController.h
@@ -32,7 +32,7 @@
 #import "BITHockeyBaseViewController.h"
 
 
-@interface BITFeedbackListViewController : BITHockeyBaseViewController <UITableViewDelegate, UITableViewDataSource, UIActionSheetDelegate> {
+@interface BITFeedbackListViewController : BITHockeyBaseViewController <UITableViewDelegate, UITableViewDataSource, UIActionSheetDelegate, UIAlertViewDelegate> {
 }
 
 @end
\ No newline at end of file
diff --git a/Classes/BITFeedbackListViewController.m b/Classes/BITFeedbackListViewController.m
index 209dbcb3bb..fc92320517 100644
--- a/Classes/BITFeedbackListViewController.m
+++ b/Classes/BITFeedbackListViewController.m
@@ -210,15 +210,27 @@
 }
 
 - (void)deleteAllMessagesAction:(id)sender {
-  UIActionSheet *deleteAction = [[UIActionSheet alloc] initWithTitle:BITHockeyLocalizedString(@"HockeyFeedbackListDeleteAllTitle")
-                                                            delegate:self
-                                                   cancelButtonTitle:BITHockeyLocalizedString(@"HockeyFeedbackListDeleteAllCancel")
-                                              destructiveButtonTitle:BITHockeyLocalizedString(@"HockeyFeedbackListDeleteAllDelete")
-                                                   otherButtonTitles:nil
-                               ];
-  [deleteAction setActionSheetStyle:UIActionSheetStyleBlackTranslucent];
-  [deleteAction showInView:self.view];
-  [deleteAction release];
+  if (UI_USER_INTERFACE_IDIOM() != UIUserInterfaceIdiomPad) {
+    UIActionSheet *deleteAction = [[UIActionSheet alloc] initWithTitle:BITHockeyLocalizedString(@"HockeyFeedbackListDeleteAllTitle")
+                                                              delegate:self
+                                                     cancelButtonTitle:BITHockeyLocalizedString(@"HockeyFeedbackListDeleteAllCancel")
+                                                destructiveButtonTitle:BITHockeyLocalizedString(@"HockeyFeedbackListDeleteAllDelete")
+                                                     otherButtonTitles:nil
+                                   ];
+    [deleteAction setActionSheetStyle:UIActionSheetStyleBlackTranslucent];
+    [deleteAction showInView:self.view];
+    [deleteAction release];
+  } else {
+    UIAlertView *deleteAction = [[UIAlertView alloc] initWithTitle:BITHockeyLocalizedString(@"HockeyFeedbackListButonDeleteAllMessages")
+                                                           message:BITHockeyLocalizedString(@"HockeyFeedbackListDeleteAllTitle")
+                                                       delegate:self
+                                              cancelButtonTitle:BITHockeyLocalizedString(@"HockeyFeedbackListDeleteAllCancel")
+                                              otherButtonTitles:BITHockeyLocalizedString(@"HockeyFeedbackListDeleteAllDelete"), nil];
+    
+    [deleteAction show];
+    [deleteAction release];
+    
+  }
 }
 
 
@@ -480,6 +492,14 @@
 }
 
 
+#pragma mark - UIAlertViewDelegate
+
+- (void)alertView:(UIAlertView *)alertView didDismissWithButtonIndex:(NSInteger)buttonIndex {
+  if (buttonIndex == [alertView firstOtherButtonIndex]) {
+    [self deleteAllMessages];
+  }
+}
+
 
 #pragma mark - UIActionSheetDelegate
 
@@ -489,4 +509,5 @@
   }
 }
 
+
 @end