diff --git a/wiki/Setting-up-email.html b/wiki/Setting-up-email.html
deleted file mode 100644
index ecc6e67..0000000
--- a/wiki/Setting-up-email.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="" xml:lang="">
-	<head>
-		<meta charset="utf-8" />
-		<meta name="generator" content="pandoc" />
-		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
-								<title>setting up email</title>
-		<link rel="stylesheet" href="/style.css">
-		<style type="text/css">
-code{white-space: pre-wrap;}
-span.smallcaps{font-variant: small-caps;}
-span.underline{text-decoration: underline;}
-div.column{display: inline-block; vertical-align: top; width: 50%;}
-		</style>
-								<!--[if lt IE 9]>
-			<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
-		<![endif]-->
-			</head>
-	<body>
-		<a href="/wiki/">&lt; back to wiki home</a>
-						<header>
-			<h1 class="title">setting up email</h1>
-			
-			
-					</header>
-						<p>Your shiny, new tilde.club account comes with an email account you can use only between tilde.club members. <code>pine</code> is a command-line email application to use it, as is <code>mutt</code>. Good old-fashioned <code>mail</code> works too, although it’s a little cryptic.</p>
-<p><code>pine</code> is menu driven, and the menus are self-explanatory; it’s surprisingly easy to learn, and surprisingly powerful when you want to customize it.</p>
-<p>From the command line (after logged in via SSH), type: <code>pine</code> and <code>[return]</code> Follow instructions and use the menus at the bottom and top. (Note: When you see the ^ in front of the letter it means you need to use CTRL, otherwise just use the letter.)</p>
-			</body>
-</html>
-
diff --git a/wiki/email.html b/wiki/email.html
index e69395f..da33019 100644
--- a/wiki/email.html
+++ b/wiki/email.html
@@ -4,8 +4,8 @@
 		<meta charset="utf-8" />
 		<meta name="generator" content="pandoc" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
-				<meta name="author" content="vielmetti" />
-								<title>Setting up email</title>
+				<meta name="author" content="benharri" />
+								<title>email</title>
 		<link rel="stylesheet" href="/style.css">
 		<style type="text/css">
 code{white-space: pre-wrap;}
@@ -20,15 +20,25 @@ div.column{display: inline-block; vertical-align: top; width: 50%;}
 	<body>
 		<a href="/wiki/">&lt; back to wiki home</a>
 						<header>
-			<h1 class="title">Setting up email</h1>
+			<h1 class="title">email</h1>
 			
 						<p>authors:</p>
-								<p class="author"><a href="/~vielmetti/">~vielmetti</a></p>
+								<p class="author"><a href="/~benharri/">~benharri</a></p>
 							
 					</header>
-						<p>Your shiny, new tilde.club account comes with an email account you can use between tilde.club members as well as internet email. <code>alpine</code> is a command-line email application to use it, as is <code>mutt</code>. Good old-fashioned <code>mail</code> works too, although it’s a little cryptic.</p>
+						<p>Your shiny, new tilde.club account comes with an email account. <code>alpine</code> is a command-line email application to use it, as is <code>mutt</code>. Good old-fashioned <code>mail</code> works too, although it’s a little cryptic.</p>
 <p><code>alpine</code> is menu driven, and the menus are self-explanatory; it’s surprisingly easy to learn, and surprisingly powerful when you want to customize it.</p>
-<p>From the command line (after logged in via SSH), type: <code>alpine</code> and <code>[return]</code> Follow instructions and use the menus at the bottom and top. (Note: When you see the ^ in front of the letter it means you need to use CTRL, otherwise just use the letter.)</p>
+<p>From the command line (after logged in via SSH), type: <code>pine</code> and <code>[return]</code> Follow instructions and use the menus at the bottom and top. (Note: When you see the ^ in front of the letter it means you need to use CTRL, otherwise just use the letter.)</p>
+<h2 id="non-cli-options">non-cli options</h2>
+<p>alternatively, you can use the <a href="https://webmail.tilde.club/">webmail</a> or standard imap/smtp.</p>
+<p>some clients will automatically detect the right settings (tested with thunderbird).</p>
+<p>connection settings: - imap.tilde.club port 993 with ssl - pop3.tilde.club port 995 with ssl - smtp.tilde.club port 587 with starttls</p>
+<p>if you’d like your <span class="citation" data-cites="tilde.club">@tilde.club</span> mail forwarded elsewhere, you can put an email address in a file called <code>~/.forward</code></p>
+<h2 id="sieve-filtering">sieve filtering</h2>
+<p>our dovecot configuration supports <a href="http://sieve.info/">sieve</a> and <a href="https://wiki1.dovecot.org/ManageSieve">managesieve</a>.</p>
+<p>this means that you should put your scripts in a <code>~/sieve/</code> directory, symlink the active script to <code>~/.dovecot.sieve</code>, and make sure to compile it with <code>sievec ~/.dovecot.sieve</code>.</p>
+<p>you can find some example sieve scripts <a href="https://wiki.dovecot.org/Pigeonhole/Sieve/Examples">here</a>.</p>
+<p>alternately, you can use webmail’s <a href="https://webmail.tilde.club/#/settings/filters">filter settings</a> to configure your filters.</p>
 			</body>
 </html>
 
diff --git a/wiki/source/Setting-up-email.md b/wiki/source/Setting-up-email.md
deleted file mode 100644
index c9ce11d..0000000
--- a/wiki/source/Setting-up-email.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-title: setting up email
----
-
-Your shiny, new tilde.club account comes with an email account you can use only between tilde.club members. `pine`  is a command-line email application to use it, as is `mutt`. Good old-fashioned `mail` works too, although it's a little cryptic.
-
-`pine` is menu driven, and the menus are self-explanatory; it's surprisingly easy to learn, and surprisingly powerful when you want to customize it.
-
-From the command line (after logged in via SSH), type: `pine` and `[return]`
-Follow instructions and use the menus at the bottom and top. (Note: When you see the ^ in front of the letter it means you need to use CTRL, otherwise just use the letter.)
-
diff --git a/wiki/source/email.md b/wiki/source/email.md
index 79684ce..78692a0 100644
--- a/wiki/source/email.md
+++ b/wiki/source/email.md
@@ -1,12 +1,41 @@
 ---
-title: Setting up email
-author: vielmetti
+title: email
+author: benharri
 ---
 
-
-Your shiny, new tilde.club account comes with an email account you can use between tilde.club members as well as internet email. `alpine`  is a command-line email application to use it, as is `mutt`. Good old-fashioned `mail` works too, although it's a little cryptic.
+Your shiny, new tilde.club account comes with an email account. `alpine`  is a command-line email application to use it, as is `mutt`. Good old-fashioned `mail` works too, although it's a little cryptic.
 
 `alpine` is menu driven, and the menus are self-explanatory; it's surprisingly easy to learn, and surprisingly powerful when you want to customize it.
 
-From the command line (after logged in via SSH), type: `alpine` and `[return]`
+From the command line (after logged in via SSH), type: `pine` and `[return]`
 Follow instructions and use the menus at the bottom and top. (Note: When you see the ^ in front of the letter it means you need to use CTRL, otherwise just use the letter.)
+
+## non-cli options
+
+alternatively, you can use the [webmail](https://webmail.tilde.club/) or standard imap/smtp.
+
+some clients will automatically detect the right settings (tested with thunderbird).
+
+connection settings:
+- imap.tilde.club port 993 with ssl
+- pop3.tilde.club port 995 with ssl
+- smtp.tilde.club port 587 with starttls
+
+if you'd like your @tilde.club mail forwarded elsewhere, you can put an email 
+address in a file called `~/.forward`
+
+## sieve filtering
+
+our dovecot configuration supports [sieve](http://sieve.info/) and 
+[managesieve](https://wiki1.dovecot.org/ManageSieve).
+
+this means that you should put your scripts in a `~/sieve/` directory,
+symlink the active script to `~/.dovecot.sieve`, and make sure to compile it
+with `sievec ~/.dovecot.sieve`.
+
+you can find some example sieve scripts [here](
+https://wiki.dovecot.org/Pigeonhole/Sieve/Examples).
+
+alternately, you can use webmail's [filter settings](
+https://webmail.tilde.club/#/settings/filters) to configure your filters.
+
diff --git a/wiki/source/wiki.md b/wiki/source/wiki.md
new file mode 100644
index 0000000..93e2894
--- /dev/null
+++ b/wiki/source/wiki.md
@@ -0,0 +1,24 @@
+---
+title: how to contribute to this wiki
+author: benharri
+---
+
+1. grab a copy of the site's source code
+
+    git clone https://github.com/tildeclub/site tilde.club && cd tilde.club/wiki
+
+1. make a new article or update an existing one (only change the markdown
+   source)
+
+1. generate the wiki pages. you need to be in the wiki directory.
+   run `./build-wiki.sh` to create the html.
+
+1. submit the code via a PR on github or with git-send-email(1) to root@tilde.chat
+   see [git-send-email.io](https://git-send-email.io) for more info on how to use
+   it. if you're working locally on tilde.club, you won't have to configure
+   anything; git will use the system's sendmail to handle the email.
+
+1. profit???
+
+ask on irc if you have questions!
+
diff --git a/wiki/wiki.html b/wiki/wiki.html
new file mode 100644
index 0000000..5a554d2
--- /dev/null
+++ b/wiki/wiki.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="" xml:lang="">
+	<head>
+		<meta charset="utf-8" />
+		<meta name="generator" content="pandoc" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
+				<meta name="author" content="benharri" />
+								<title>how to contribute to this wiki</title>
+		<link rel="stylesheet" href="/style.css">
+		<style type="text/css">
+code{white-space: pre-wrap;}
+span.smallcaps{font-variant: small-caps;}
+span.underline{text-decoration: underline;}
+div.column{display: inline-block; vertical-align: top; width: 50%;}
+		</style>
+								<!--[if lt IE 9]>
+			<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
+		<![endif]-->
+			</head>
+	<body>
+		<a href="/wiki/">&lt; back to wiki home</a>
+						<header>
+			<h1 class="title">how to contribute to this wiki</h1>
+			
+						<p>authors:</p>
+								<p class="author"><a href="/~benharri/">~benharri</a></p>
+							
+					</header>
+						<ol type="1">
+<li><p>grab a copy of the site’s source code</p>
+<p>git clone https://github.com/tildeclub/site tilde.club &amp;&amp; cd tilde.club/wiki</p></li>
+<li><p>make a new article or update an existing one (only change the markdown source)</p></li>
+<li><p>generate the wiki pages. you need to be in the wiki directory. run <code>./build-wiki.sh</code> to create the html.</p></li>
+<li><p>submit the code via a PR on github or with git-send-email(1) to root@tilde.chat see <a href="https://git-send-email.io">git-send-email.io</a> for more info on how to use it. if you’re working locally on tilde.club, you won’t have to configure anything; git will use the system’s sendmail to handle the email.</p></li>
+<li><p>profit???</p></li>
+</ol>
+<p>ask on irc if you have questions!</p>
+			</body>
+</html>
+
