<p><a href="https://github.com/johnmolyneux" class="user-mention">@johnmolyneux</a>: Oh, I totally forgot we had some local changes, sorry. I'm attaching the patches as sorted out by <code>git format-patch</code>. Let me know if you'd rather them differently or through another channel.</p>

<p><a href="https://gist.github.com/nicolas33/637b6d7457e387f0af95">https://gist.github.com/nicolas33/637b6d7457e387f0af95</a></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/issues/173#issuecomment-77110499">view it on GitHub</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/AKFSEJfxuzgm4Zm-MX3J47BF1Rz2-8Qvks5nxrA5gaJpZM4DkLGq.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/issues/173#issuecomment-77110499"></link>
    <meta itemprop="name" content="View Issue"></meta>
  </div>
  <meta itemprop="description" content="View this Issue on GitHub"></meta>
</div>