<p>I have commented and am following a diary entry and got the an email about the following new comment on the diary entry: <a href="http://www.openstreetmap.org/user/joost%20schouppe/diary/40854#comment38351">http://www.openstreetmap.org/user/joost%20schouppe/diary/40854#comment38351</a></p>
<p>The subject of the email is:<br>
"[OpenStreetMap] SimonPoole commented on your diary entry"</p>
<p>Whilst it should say:<br>
"[OpenStreetMap] SimonPoole commented on a diary entry you commented on"<br>
or<br>
"[OpenStreetMap] SimonPoole commented on a diary entry you are following"</p>
<p>Similarly for the message body:<br>
"SimonPoole has commented on your recent OpenStreetMap diary entry with the subject Missing Maps Mapathons as a recruiting instrument:"<br>
It's not my diary entry, so it should instead say something like:<br>
"SimonPoole has commented on a recent OpenStreetMap diary entry you are following with the subject Missing Maps Mapathons as a recruiting instrument:</p>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/openstreetmap/openstreetmap-website/issues/1531">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/ABWnLbSPnHOCFEJ26_rWWNP2i5zhEydpks5r0bLZgaJpZM4NLQ2o">mute the thread</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/ABWnLQ4Z476G9EDhZqJbA_03kF-DGgkPks5r0bLZgaJpZM4NLQ2o.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/openstreetmap/openstreetmap-website/issues/1531"></link>
  <meta itemprop="name" content="View Issue"></meta>
</div>
<meta itemprop="description" content="View this Issue on GitHub"></meta>
</div>

<script type="application/json" data-scope="inboxmarkup">{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/openstreetmap/openstreetmap-website","title":"openstreetmap/openstreetmap-website","subtitle":"GitHub repository","main_image_url":"https://cloud.githubusercontent.com/assets/143418/17495839/a5054eac-5d88-11e6-95fc-7290892c7bb5.png","avatar_image_url":"https://cloud.githubusercontent.com/assets/143418/15842166/7c72db34-2c0b-11e6-9aed-b52498112777.png","action":{"name":"Open in GitHub","url":"https://github.com/openstreetmap/openstreetmap-website"}},"updates":{"snippets":[{"icon":"DESCRIPTION","message":"Incorrect preposition when someone comments on someone else's diary entry you have commented on (#1531)"}],"action":{"name":"View Issue","url":"https://github.com/openstreetmap/openstreetmap-website/issues/1531"}}}</script>