diff --git a/inbox.py b/inbox.py
index 77a10631c..2e4133eec 100644
--- a/inbox.py
+++ b/inbox.py
@@ -56,6 +56,7 @@ from posts import isImageMedia
 from posts import sendSignedJson
 from webinterface import individualPostAsHtml
 from webinterface import getIconsDir
+from question import questionUpdateVotes
 
 def inboxStorePostToHtmlCache(recentPostsCache: {},maxRecentPosts: int, \
                               translate: {}, \
@@ -1795,6 +1796,7 @@ def inboxAfterCapabilities(recentPostsCache: {},maxRecentPosts: int, \
         # list of indexes to be updated
         updateIndexList=['inbox']
         populateReplies(baseDir,httpPrefix,domain,messageJson,maxReplies,debug)
+        questionUpdateVotes(baseDir,nickname,domain,messageJson)
         if not isGroup:
             # create a DM notification file if needed
             if isDM(postJsonObject):
diff --git a/question.py b/question.py
new file mode 100644
index 000000000..37e0d3a38
--- /dev/null
+++ b/question.py
@@ -0,0 +1,99 @@
+__filename__ = "question.py"
+__author__ = "Bob Mottram"
+__license__ = "AGPL3+"
+__version__ = "1.0.0"
+__maintainer__ = "Bob Mottram"
+__email__ = "bob@freedombone.net"
+__status__ = "Production"
+
+import os
+from utils import locatePost
+from utils import loadJson
+from utils import saveJson
+
+def questionUpdateVotes(baseDir: str,nickname: str,domain: str,replyJson: {}):
+    """ For a given reply update the votes on a question
+    """
+    if not replyJson.get('object'):
+        return
+    if not isinstance(replyJson['object'], dict):
+        return
+    if not replyJson['object'].get('inReplyTo'):
+        return
+    if not replyJson['object']['inReplyTo']:
+        return
+    if not replyJson['object'].get('content'):
+        return
+    inReplyTo=replyJson['object']['inReplyTo']
+    questionPostFilename=locatePost(baseDir,nickname,domain,inReplyTo)
+    if not questionPostFilename:
+        return
+    questionJson=loadJson(questionPostFilename)
+    if not questionJson:
+        return
+    if not questionJson.get('object'):
+        return
+    if not isinstance(questionJson['object'], dict):
+        return
+    if not questionJson['object'].get('type'):
+        return
+    if questionJson['type']!='Question':
+        return
+    if not questionJson['object'].get('oneOf'):
+        return
+    if not isinstance(questionJson['object']['oneOf'], list):
+        return
+    content=replyJson['object']['content']
+    # does the reply content match any possible question option?
+    foundAnswer=None
+    for possibleAnswer in questionJson['object']['oneOf']:
+        if not possibleAnswer.get('name'):
+            continue
+        if possibleAnswer['name'] in content:
+            foundAnswer=possibleAnswer
+            break
+    if not foundAnswer:
+        return
+    # update the voters file
+    votersFileSeparator=';;;'
+    votersFilename=questionPostFilename.replace('.json','.voters')
+    if not os.path.isfile(votersFilename):
+        # create a new voters file
+        votersFile=open(votersFilename, "w")
+        if votersFile:
+            votersFile.write(replyJson['actor']+votersFileSeparator+foundAnswer+'\n')
+            votersFile.close()
+    else:
+        if replyJson['actor'] not in open(votersFilename).read():
+            # append to the voters file
+            votersFile=open(votersFilename, "a+")
+            if votersFile:
+                votersFile.write(replyJson['actor']+votersFileSeparator+foundAnswer+'\n')
+                votersFile.close()
+        else:
+            # change an entry in the voters file
+            with open(votersFilename, "r") as votersFile:
+                lines = votersFile.readlines()
+                with open(votersFilename, "w") as votersFile:
+                    for voteLine in lines:
+                        if voteLine.startswith(replyJson['actor']+votersFileSeparator):
+                            votersFile.write(replyJson['actor']+votersFileSeparator+foundAnswer+'\n')
+                            break
+                        votersFile.write(voteLine)
+    # update the vote counts
+    questionTotalsChanged=False
+    for possibleAnswer in questionJson['object']['oneOf']:
+        if not possibleAnswer.get('name'):
+            continue
+        totalItems=0
+        with open(votersFilename, "r") as votersFile:
+            lines = votersFile.readlines()
+            for voteLine in lines:
+                if voteLine.endswith(votersFileSeparator+possibleAnswer['name']+'\n'):
+                    totalItems+=1                    
+        if possibleAnswer['replies']['totalItems']!=totalItems:
+            possibleAnswer['replies']['totalItems']=totalItems
+            questionTotalsChanged=True
+    if questionTotalsChanged:
+        # save the question with altered totals
+        saveJson(questionJson,questionPostFilename)