diff --git a/src/com/fsck/k9/SearchAccount.java b/src/com/fsck/k9/SearchAccount.java
index 79161061d..b990e8d09 100644
--- a/src/com/fsck/k9/SearchAccount.java
+++ b/src/com/fsck/k9/SearchAccount.java
@@ -1,6 +1,3 @@
-/**
- *
- */
 package com.fsck.k9;
 
 import java.io.Serializable;
@@ -10,6 +7,10 @@ import android.content.Context;
 
 import com.fsck.k9.mail.Flag;
 
+/**
+ * This is a meta-Account that represents one or more accounts with filters on them.  The filter specification
+ * is defined by {@link com.fsck.k9.activity.SearchModifier}.
+ */
 public class SearchAccount implements BaseAccount, SearchSpecification, Serializable {
     private static final long serialVersionUID = -4388420303235543976L;
     private Flag[] mRequiredFlags = null;
@@ -24,17 +25,14 @@ public class SearchAccount implements BaseAccount, SearchSpecification, Serializ
     private String[] folderNames = null;
 
     public SearchAccount(Preferences preferences) {
-
     }
-    protected synchronized void delete(Preferences preferences) {
 
+    protected synchronized void delete(Preferences preferences) {
     }
 
     public synchronized void save(Preferences preferences) {
-
     }
 
-
     public SearchAccount(Context context, boolean nintegrate, Flag[] requiredFlags, Flag[] forbiddenFlags) {
         mRequiredFlags = requiredFlags;
         mForbiddenFlags = forbiddenFlags;
@@ -78,12 +76,14 @@ public class SearchAccount implements BaseAccount, SearchSpecification, Serializ
     public void setQuery(String query) {
         this.query = query;
     }
+
     public String getUuid() {
         if (mUuid == null) {
             setUuid(UUID.randomUUID().toString());
         }
         return mUuid;
     }
+
     public void setUuid(String nUuid) {
         mUuid = nUuid;
     }
@@ -99,16 +99,20 @@ public class SearchAccount implements BaseAccount, SearchSpecification, Serializ
     public void setBuiltin(boolean builtin) {
         this.builtin = builtin;
     }
+
     public String[] getAccountUuids() {
         return accountUuids;
     }
+
     public void setAccountUuids(String[] accountUuids) {
         this.accountUuids = accountUuids;
     }
+
     @Override
     public String[] getFolderNames() {
         return folderNames;
     }
+
     public void setFolderNames(String[] folderNames) {
         this.folderNames = folderNames;
     }
diff --git a/src/com/fsck/k9/activity/SearchModifier.java b/src/com/fsck/k9/activity/SearchModifier.java
index b23330c80..8b610ff6e 100644
--- a/src/com/fsck/k9/activity/SearchModifier.java
+++ b/src/com/fsck/k9/activity/SearchModifier.java
@@ -1,13 +1,14 @@
-/**
- *
- */
 package com.fsck.k9.activity;
 
 import com.fsck.k9.R;
 import com.fsck.k9.mail.Flag;
 
+/**
+ * This enum represents filtering parameters used by {@link com.fsck.k9.SearchAccount}.
+ */
 enum SearchModifier {
-    FLAGGED(R.string.flagged_modifier, new Flag[] { Flag.FLAGGED}, null), UNREAD(R.string.unread_modifier, null, new Flag[] { Flag.SEEN});
+    FLAGGED(R.string.flagged_modifier, new Flag[]{Flag.FLAGGED}, null),
+    UNREAD(R.string.unread_modifier, null, new Flag[]{Flag.SEEN});
 
     final int resId;
     final Flag[] requiredFlags;