Oh! Ok, that's why I didn't see a merge request. Cool, that's exactly how it should be. :) In other news, I finally figured out why the server kept crashing (on this site). Someone put a match string in their inbox rules that doesn't compile to a regular expression. regcomp() fails, and then when we do the match, the library throws a segfault. I modified the code to only do a match if the regex compiles successfully, and we've been running clean ever since.
Unfortunately the server crashed in such a way that my user record got corrupted! That's why that "undocumented recovery mode" got added to the tree. :)
