<p>I've squashed both patches, looks good to me. While ready for a merge, it's missing the documentation in offlineimap.conf.</p>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br>Reply to this email directly or <a href="https://github.com/OfflineIMAP/offlineimap/pull/265#issuecomment-153525627">view it on GitHub</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/AKFSEPYXNCnOXkVsYzumudGgCRadMh-Rks5pCT3FgaJpZM4GXNZl.gif" width="1" /></p>
<div itemscope itemtype="http://schema.org/EmailMessage">
<div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
  <link itemprop="url" href="https://github.com/OfflineIMAP/offlineimap/pull/265#issuecomment-153525627"></link>
  <meta itemprop="name" content="View Pull Request"></meta>
</div>
<meta itemprop="description" content="View this Pull Request on GitHub"></meta>
</div>