diff --git a/daemon.py b/daemon.py
index b1c30a742..ccf9b446e 100644
--- a/daemon.py
+++ b/daemon.py
@@ -1115,7 +1115,9 @@ class PubServer(BaseHTTPRequestHandler):
             print('Posting to nickname ' + postToNickname)
             self.postToNickname = postToNickname
 
-        return postMessageToOutbox(messageJson, self.postToNickname,
+        return postMessageToOutbox(self.server.session,
+                                   self.server.translate,
+                                   messageJson, self.postToNickname,
                                    self.server, self.server.baseDir,
                                    self.server.httpPrefix,
                                    self.server.domain,
diff --git a/outbox.py b/outbox.py
index 11d595c6e..05b21240e 100644
--- a/outbox.py
+++ b/outbox.py
@@ -10,6 +10,7 @@ import os
 from shutil import copyfile
 from session import createSession
 from auth import createPassword
+from posts import isImageMedia
 from posts import outboxMessageCreateWrap
 from posts import savePostToBox
 from posts import sendToFollowersThread
@@ -41,7 +42,8 @@ from shares import outboxShareUpload
 from shares import outboxUndoShareUpload
 
 
-def postMessageToOutbox(messageJson: {}, postToNickname: str,
+def postMessageToOutbox(session, translate: {},
+                        messageJson: {}, postToNickname: str,
                         server, baseDir: str, httpPrefix: str,
                         domain: str, domainFull: str,
                         onionDomain: str, i2pDomain: str, port: int,
@@ -262,6 +264,19 @@ def postMessageToOutbox(messageJson: {}, postToNickname: str,
             for boxNameIndex in indexes:
                 if not boxNameIndex:
                     continue
+
+                # should this also go to the media timeline?
+                if boxNameIndex == 'inbox':
+                    if isImageMedia(session, baseDir, httpPrefix,
+                                    postToNickname, domain,
+                                    messageJson,
+                                    translate, YTReplacementDomain,
+                                    allowLocalNetworkAccess,
+                                    recentPostsCache):
+                        inboxUpdateIndex('tlmedia', baseDir,
+                                         postToNickname + '@' + domain,
+                                         savedFilename, debug)
+
                 if boxNameIndex == 'inbox' and outboxName == 'tlblogs':
                     continue
                 # avoid duplicates of the message if already going
diff --git a/posts.py b/posts.py
index dbf0dc2fe..a2340eaa1 100644
--- a/posts.py
+++ b/posts.py
@@ -3148,6 +3148,7 @@ def _createBoxIndexed(recentPostsCache: {},
         baseDir + '/accounts/' + timelineNickname + '@' + domain + \
         '/' + indexBoxName + '.index'
     postsCtr = 0
+    postsAddedToTimeline = 0
     if os.path.isfile(indexFilename):
         with open(indexFilename, 'r') as indexFile:
             postsAddedToTimeline = 0
diff --git a/schedule.py b/schedule.py
index 5b4616d54..13f2f4586 100644
--- a/schedule.py
+++ b/schedule.py
@@ -85,7 +85,9 @@ def _updatePostSchedule(baseDir: str, handle: str, httpd,
 
             if nickname:
                 httpd.postToNickname = nickname
-            if not postMessageToOutbox(postJsonObject, nickname,
+            if not postMessageToOutbox(httpd.session,
+                                       httpd.translate,
+                                       postJsonObject, nickname,
                                        httpd, baseDir,
                                        httpd.httpPrefix,
                                        httpd.domain,