diff --git a/options.html b/options.html
index a742ea3f7..d92ca9adc 100644
--- a/options.html
+++ b/options.html
@@ -516,6 +516,28 @@ else
                     <home-manager/modules/programs/neomutt.nix>
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-accounts.email.accounts._name_.notmuch.enable"></a><a class="term" href="options.html#opt-accounts.email.accounts._name_.notmuch.enable"><code class="option">accounts.email.accounts.&lt;name&gt;.notmuch.enable</code></a></span></dt><dd><p>Whether to enable notmuch indexing.</p><p><span class="emphasis"><em>Type:</em></span> boolean</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">false</code></p><p><span class="emphasis"><em>Example:</em></span> <code class="literal">true</code></p><p><span class="emphasis"><em>Declared by:</em></span></p><table border="0" summary="Simple list" class="simplelist"><tr><td><code class="filename"><a class="filename" href="https://github.com/nix-community/home-manager/blob/master/modules/programs/notmuch.nix#blob-path" target="_top">
                     &lt;home-manager/modules/programs/notmuch.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-accounts.email.accounts._name_.notmuch.neomutt.enable"></a><a class="term" href="options.html#opt-accounts.email.accounts._name_.notmuch.neomutt.enable"><code class="option">accounts.email.accounts.&lt;name&gt;.notmuch.neomutt.enable</code></a></span></dt><dd><p>Whether to enable Notmuch support in NeoMutt.</p><p><span class="emphasis"><em>Type:</em></span> boolean</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">true</code></p><p><span class="emphasis"><em>Example:</em></span> <code class="literal">true</code></p><p><span class="emphasis"><em>Declared by:</em></span></p><table border="0" summary="Simple list" class="simplelist"><tr><td><code class="filename"><a class="filename" href="https://github.com/nix-community/home-manager/blob/master/modules/programs/neomutt.nix#blob-path" target="_top">
+                    &lt;home-manager/modules/programs/neomutt.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-accounts.email.accounts._name_.notmuch.neomutt.virtualMailboxes"></a><a class="term" href="options.html#opt-accounts.email.accounts._name_.notmuch.neomutt.virtualMailboxes"><code class="option">accounts.email.accounts.&lt;name&gt;.notmuch.neomutt.virtualMailboxes</code></a></span></dt><dd><p>List of virtual mailboxes using Notmuch queries</p><p><span class="emphasis"><em>Type:</em></span> list of (submodule)</p><p><span class="emphasis"><em>Default:</em></span> </p><pre class="programlisting">[
+  {
+    name = "My INBOX";
+    query = "tag:inbox";
+  }
+]</pre><p><span class="emphasis"><em>Example:</em></span> </p><pre class="programlisting">[
+  {
+    name = "My INBOX";
+    query = "tag:inbox";
+  }
+]</pre><p><span class="emphasis"><em>Declared by:</em></span></p><table border="0" summary="Simple list" class="simplelist"><tr><td><code class="filename"><a class="filename" href="https://github.com/nix-community/home-manager/blob/master/modules/programs/neomutt.nix#blob-path" target="_top">
+                    &lt;home-manager/modules/programs/neomutt.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-accounts.email.accounts._name_.notmuch.neomutt.virtualMailboxes._.limit"></a><a class="term" href="options.html#opt-accounts.email.accounts._name_.notmuch.neomutt.virtualMailboxes._.limit"><code class="option">accounts.email.accounts.&lt;name&gt;.notmuch.neomutt.virtualMailboxes.*.limit</code></a></span></dt><dd><p>Restricts number of messages/threads in the result.</p><p><span class="emphasis"><em>Type:</em></span> null or signed integer</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">null</code></p><p><span class="emphasis"><em>Example:</em></span> <code class="literal">10</code></p><p><span class="emphasis"><em>Declared by:</em></span></p><table border="0" summary="Simple list" class="simplelist"><tr><td><code class="filename"><a class="filename" href="https://github.com/nix-community/home-manager/blob/master/modules/programs/notmuch-virtual-mailbox.nix#blob-path" target="_top">
+                    &lt;home-manager/modules/programs/notmuch-virtual-mailbox.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-accounts.email.accounts._name_.notmuch.neomutt.virtualMailboxes._.name"></a><a class="term" href="options.html#opt-accounts.email.accounts._name_.notmuch.neomutt.virtualMailboxes._.name"><code class="option">accounts.email.accounts.&lt;name&gt;.notmuch.neomutt.virtualMailboxes.*.name</code></a></span></dt><dd><p>Name to display</p><p><span class="emphasis"><em>Type:</em></span> string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"My INBOX"</code></p><p><span class="emphasis"><em>Example:</em></span> <code class="literal">"My INBOX"</code></p><p><span class="emphasis"><em>Declared by:</em></span></p><table border="0" summary="Simple list" class="simplelist"><tr><td><code class="filename"><a class="filename" href="https://github.com/nix-community/home-manager/blob/master/modules/programs/notmuch-virtual-mailbox.nix#blob-path" target="_top">
+                    &lt;home-manager/modules/programs/notmuch-virtual-mailbox.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-accounts.email.accounts._name_.notmuch.neomutt.virtualMailboxes._.query"></a><a class="term" href="options.html#opt-accounts.email.accounts._name_.notmuch.neomutt.virtualMailboxes._.query"><code class="option">accounts.email.accounts.&lt;name&gt;.notmuch.neomutt.virtualMailboxes.*.query</code></a></span></dt><dd><p>Notmuch query</p><p><span class="emphasis"><em>Type:</em></span> string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"tag:inbox"</code></p><p><span class="emphasis"><em>Example:</em></span> <code class="literal">"tag:inbox"</code></p><p><span class="emphasis"><em>Declared by:</em></span></p><table border="0" summary="Simple list" class="simplelist"><tr><td><code class="filename"><a class="filename" href="https://github.com/nix-community/home-manager/blob/master/modules/programs/notmuch-virtual-mailbox.nix#blob-path" target="_top">
+                    &lt;home-manager/modules/programs/notmuch-virtual-mailbox.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-accounts.email.accounts._name_.notmuch.neomutt.virtualMailboxes._.type"></a><a class="term" href="options.html#opt-accounts.email.accounts._name_.notmuch.neomutt.virtualMailboxes._.type"><code class="option">accounts.email.accounts.&lt;name&gt;.notmuch.neomutt.virtualMailboxes.*.type</code></a></span></dt><dd><p>Reads all matching messages or whole-threads. The default is 'messages' or nm_query_type.</p><p><span class="emphasis"><em>Type:</em></span> null or one of "threads", "messages"</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">null</code></p><p><span class="emphasis"><em>Example:</em></span> <code class="literal">"threads"</code></p><p><span class="emphasis"><em>Declared by:</em></span></p><table border="0" summary="Simple list" class="simplelist"><tr><td><code class="filename"><a class="filename" href="https://github.com/nix-community/home-manager/blob/master/modules/programs/notmuch-virtual-mailbox.nix#blob-path" target="_top">
+                    &lt;home-manager/modules/programs/notmuch-virtual-mailbox.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-accounts.email.accounts._name_.offlineimap.enable"></a><a class="term" href="options.html#opt-accounts.email.accounts._name_.offlineimap.enable"><code class="option">accounts.email.accounts.&lt;name&gt;.offlineimap.enable</code></a></span></dt><dd><p>Whether to enable OfflineIMAP.</p><p><span class="emphasis"><em>Type:</em></span> boolean</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">false</code></p><p><span class="emphasis"><em>Example:</em></span> <code class="literal">true</code></p><p><span class="emphasis"><em>Declared by:</em></span></p><table border="0" summary="Simple list" class="simplelist"><tr><td><code class="filename"><a class="filename" href="https://github.com/nix-community/home-manager/blob/master/modules/programs/offlineimap.nix#blob-path" target="_top">
                     &lt;home-manager/modules/programs/offlineimap.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-accounts.email.accounts._name_.offlineimap.extraConfig.account"></a><a class="term" href="options.html#opt-accounts.email.accounts._name_.offlineimap.extraConfig.account"><code class="option">accounts.email.accounts.&lt;name&gt;.offlineimap.extraConfig.account</code></a></span></dt><dd><p>Extra configuration options to add to the account section.</p><p><span class="emphasis"><em>Type:</em></span> attribute set of (string or signed integer or boolean)</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">{ }</code></p><p><span class="emphasis"><em>Example:</em></span> </p><pre class="programlisting">{