diff --git a/src/com/fsck/k9/mail/store/WebDavStore.java b/src/com/fsck/k9/mail/store/WebDavStore.java
index 6bf7d951e..e32bd06e1 100644
--- a/src/com/fsck/k9/mail/store/WebDavStore.java
+++ b/src/com/fsck/k9/mail/store/WebDavStore.java
@@ -2138,7 +2138,7 @@ public class WebDavStore extends Store
      * done elsewhere.  This is done rather than having multiple hashmaps
      * associating UIDs to values
      */
-    public class ParsedMessageEnvelope
+    public static class ParsedMessageEnvelope
     {
         /**
          * Holds the mappings from the name returned from Exchange to the MIME format header name
@@ -2564,7 +2564,7 @@ public class WebDavStore extends Store
     /**
      * Simple data container for passing connection information.
      */
-    private class ConnectionInfo
+    private static class ConnectionInfo
     {
         public int statusCode;
         public short requiredAuthType;