diff --git a/k9mail/src/main/java/com/fsck/k9/K9.java b/k9mail/src/main/java/com/fsck/k9/K9.java
index 6c5f97276..994a4e83c 100644
--- a/k9mail/src/main/java/com/fsck/k9/K9.java
+++ b/k9mail/src/main/java/com/fsck/k9/K9.java
@@ -587,12 +587,12 @@ public class K9 extends Application {
 
             private void updateMailListWidget() {
                 try {
-                    MessageListWidgetProvider.updateMailViewList(K9.this);
-                } catch (Exception e) {
+                    MessageListWidgetProvider.triggerMessageListWidgetUpdate(K9.this);
+                } catch (RuntimeException e) {
                     if (BuildConfig.DEBUG) {
                         throw e;
                     } else if (K9.DEBUG) {
-                        Log.e(LOG_TAG, "Error whiile updating mail list widget", e);
+                        Log.e(LOG_TAG, "Error while updating message list widget", e);
                     }
                 }
             }
diff --git a/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListRemoteViewFactory.java b/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListRemoteViewFactory.java
index ccf9d3827..1eb32c339 100644
--- a/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListRemoteViewFactory.java
+++ b/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListRemoteViewFactory.java
@@ -94,6 +94,7 @@ public class MessageListRemoteViewFactory implements RemoteViewsService.RemoteVi
 
     @Override
     public void onDestroy() {
+        // Implement interface
     }
 
     @Override
diff --git a/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetProvider.java b/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetProvider.java
index 9a713cbe4..7b82c9384 100644
--- a/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetProvider.java
+++ b/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetProvider.java
@@ -19,7 +19,7 @@ public class MessageListWidgetProvider extends AppWidgetProvider {
     private static String ACTION_UPDATE_MESSAGE_LIST = "UPDATE_MESSAGE_LIST";
 
 
-    public static void updateMailViewList(Context context) {
+    public static void triggerMessageListWidgetUpdate(Context context) {
         Context appContext = context.getApplicationContext();
         AppWidgetManager widgetManager = AppWidgetManager.getInstance(appContext);
         ComponentName widget = new ComponentName(appContext, MessageListWidgetProvider.class);
diff --git a/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetService.java b/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetService.java
index 019336fe8..980a585c6 100644
--- a/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetService.java
+++ b/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetService.java
@@ -8,6 +8,6 @@ import android.widget.RemoteViewsService;
 public class MessageListWidgetService extends RemoteViewsService {
     @Override
     public RemoteViewsFactory onGetViewFactory(Intent intent) {
-        return new MessageListRemoteViewFactory(this.getApplicationContext());
+        return new MessageListRemoteViewFactory(getApplicationContext());
     }
 }