diff --git a/translations/ar.json b/translations/ar.json
index 33a09a5b3..4c6ea5ce2 100644
--- a/translations/ar.json
+++ b/translations/ar.json
@@ -521,5 +521,6 @@
     "mitm": "يمكن قراءة الرسالة أو تعديلها من قبل طرف ثالث",
     "Bold reading": "قراءة جريئة",
     "SHOW EDITS": "عرض التعديلات",
-    "Attach an image, video or audio file": "إرفاق صورة أو فيديو أو ملف صوتي"
+    "Attach an image, video or audio file": "إرفاق صورة أو فيديو أو ملف صوتي",
+    "Set a place and time": "حدد المكان والزمان"
 }
diff --git a/translations/ca.json b/translations/ca.json
index 85f0f5339..ce42ddc1a 100644
--- a/translations/ca.json
+++ b/translations/ca.json
@@ -521,5 +521,6 @@
     "mitm": "El missatge podria haver estat llegit o modificat per un tercer",
     "Bold reading": "Lectura atrevida",
     "SHOW EDITS": "MOSTRA EDICIONS",
-    "Attach an image, video or audio file": "Adjunteu un fitxer d'imatge, vídeo o àudio"
+    "Attach an image, video or audio file": "Adjunteu un fitxer d'imatge, vídeo o àudio",
+    "Set a place and time": "Estableix un lloc i una hora"
 }
diff --git a/translations/cy.json b/translations/cy.json
index 0383fdef7..2a0b8b9b1 100644
--- a/translations/cy.json
+++ b/translations/cy.json
@@ -521,5 +521,6 @@
     "mitm": "Gallai'r neges fod wedi cael ei darllen neu ei haddasu gan drydydd parti",
     "Bold reading": "Darllen beiddgar",
     "SHOW EDITS": "GOLYGIADAU SIOE",
-    "Attach an image, video or audio file": "Atodwch ddelwedd, fideo neu ffeil sain"
+    "Attach an image, video or audio file": "Atodwch ddelwedd, fideo neu ffeil sain",
+    "Set a place and time": "Gosodwch le ac amser"
 }
diff --git a/translations/de.json b/translations/de.json
index 8f5e1edc9..af6ae2faf 100644
--- a/translations/de.json
+++ b/translations/de.json
@@ -521,5 +521,6 @@
     "mitm": "Die Nachricht könnte von einem Dritten gelesen oder geändert worden sein",
     "Bold reading": "Mutige Lektüre",
     "SHOW EDITS": "BEARBEITUNGEN ZEIGEN",
-    "Attach an image, video or audio file": "Hängen Sie eine Bild-, Video- oder Audiodatei an"
+    "Attach an image, video or audio file": "Hängen Sie eine Bild-, Video- oder Audiodatei an",
+    "Set a place and time": "Legen Sie einen Ort und eine Zeit fest"
 }
diff --git a/translations/en.json b/translations/en.json
index e2e00d08a..d393f6c2f 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -521,5 +521,6 @@
     "mitm": "Message could have been read or modified by a third party",
     "Bold reading": "Bold reading",
     "SHOW EDITS": "SHOW EDITS",
-    "Attach an image, video or audio file": "Attach an image, video or audio file"
+    "Attach an image, video or audio file": "Attach an image, video or audio file",
+    "Set a place and time": "Set a place and time"
 }
diff --git a/translations/es.json b/translations/es.json
index d72b468e6..5927b602b 100644
--- a/translations/es.json
+++ b/translations/es.json
@@ -521,5 +521,6 @@
     "mitm": "El mensaje podría haber sido leído o modificado por un tercero",
     "Bold reading": "Lectura en negrita",
     "SHOW EDITS": "MOSTRAR EDICIONES",
-    "Attach an image, video or audio file": "Adjuntar un archivo de imagen, video o audio"
+    "Attach an image, video or audio file": "Adjuntar un archivo de imagen, video o audio",
+    "Set a place and time": "Establece un lugar y una hora"
 }
diff --git a/translations/fr.json b/translations/fr.json
index 575831804..bada75844 100644
--- a/translations/fr.json
+++ b/translations/fr.json
@@ -521,5 +521,6 @@
     "mitm": "Le message a pu être lu ou modifié par un tiers",
     "Bold reading": "Lecture audacieuse",
     "SHOW EDITS": "AFFICHER LES MODIFICATIONS",
-    "Attach an image, video or audio file": "Joindre une image, une vidéo ou un fichier audio"
+    "Attach an image, video or audio file": "Joindre une image, une vidéo ou un fichier audio",
+    "Set a place and time": "Fixez un lieu et une heure"    
 }
diff --git a/translations/ga.json b/translations/ga.json
index 119596466..1b90f985f 100644
--- a/translations/ga.json
+++ b/translations/ga.json
@@ -521,5 +521,6 @@
     "mitm": "D'fhéadfadh tríú páirtí an teachtaireacht a léamh nó a mhodhnú",
     "Bold reading": "Léamh trom",
     "SHOW EDITS": "EAGARTHÓIRÍ TAISPEÁINT",
-    "Attach an image, video or audio file": "Ceangail íomhá, físeán nó comhad fuaime"
+    "Attach an image, video or audio file": "Ceangail íomhá, físeán nó comhad fuaime",
+    "Set a place and time": "Socraigh áit agus am"
 }
diff --git a/translations/hi.json b/translations/hi.json
index 85d1a0dc5..5d27b5b11 100644
--- a/translations/hi.json
+++ b/translations/hi.json
@@ -521,5 +521,6 @@
     "mitm": "संदेश किसी तीसरे पक्ष द्वारा पढ़ा या संशोधित किया जा सकता था",
     "Bold reading": "बोल्ड रीडिंग",
     "SHOW EDITS": "संपादन दिखाएं",
-    "Attach an image, video or audio file": "एक छवि, वीडियो या ऑडियो फ़ाइल संलग्न करें"
+    "Attach an image, video or audio file": "एक छवि, वीडियो या ऑडियो फ़ाइल संलग्न करें",
+    "Set a place and time": "एक जगह और समय निर्धारित करें"
 }
diff --git a/translations/it.json b/translations/it.json
index 8f6e5ce89..741a808d4 100644
--- a/translations/it.json
+++ b/translations/it.json
@@ -521,5 +521,6 @@
     "mitm": "Il messaggio potrebbe essere stato letto o modificato da terzi",
     "Bold reading": "Lettura audace",
     "SHOW EDITS": "MOSTRA MODIFICHE",
-    "Attach an image, video or audio file": "Allega un file immagine, video o audio"
+    "Attach an image, video or audio file": "Allega un file immagine, video o audio",
+    "Set a place and time": "Stabilisci un luogo e un'ora"
 }
diff --git a/translations/ja.json b/translations/ja.json
index 07aa7992c..4871e4da4 100644
--- a/translations/ja.json
+++ b/translations/ja.json
@@ -521,5 +521,6 @@
     "mitm": "メッセージが第三者によって読み取られたり変更されたりした可能性があります",
     "Bold reading": "大胆な読書",
     "SHOW EDITS": "編集を表示",
-    "Attach an image, video or audio file": "画像、ビデオ、またはオーディオファイルを添付します"
+    "Attach an image, video or audio file": "画像、ビデオ、またはオーディオファイルを添付します",
+    "Set a place and time": "場所と時間を設定する"
 }
diff --git a/translations/ko.json b/translations/ko.json
index 38bfd2c74..4836da347 100644
--- a/translations/ko.json
+++ b/translations/ko.json
@@ -521,5 +521,6 @@
     "mitm": "제3자가 메시지를 읽거나 수정했을 수 있습니다.",
     "Bold reading": "굵은 글씨",
     "SHOW EDITS": "수정사항 보기",
-    "Attach an image, video or audio file": "이미지, 비디오 또는 오디오 파일 첨부"
+    "Attach an image, video or audio file": "이미지, 비디오 또는 오디오 파일 첨부",
+    "Set a place and time": "장소와 시간을 정하다"
 }
diff --git a/translations/ku.json b/translations/ku.json
index 6d6a2e898..cdfeeac31 100644
--- a/translations/ku.json
+++ b/translations/ku.json
@@ -521,5 +521,6 @@
     "mitm": "Peyam dikaribû ji hêla aliyek sêyemîn ve were xwendin an guhertin",
     "Bold reading": "Xwendina qelew",
     "SHOW EDITS": "GERÎŞTAN NÎŞAN DE",
-    "Attach an image, video or audio file": "Wêneyek, vîdyoyek an pelê deng veke"
+    "Attach an image, video or audio file": "Wêneyek, vîdyoyek an pelê deng veke",
+    "Set a place and time": "Cih û dem destnîşan bikin"
 }
diff --git a/translations/oc.json b/translations/oc.json
index 57e2d5471..5ee449a61 100644
--- a/translations/oc.json
+++ b/translations/oc.json
@@ -517,5 +517,6 @@
     "mitm": "Message could have been read or modified by a third party",
     "Bold reading": "Bold reading",
     "SHOW EDITS": "SHOW EDITS",
-    "Attach an image, video or audio file": "Attach an image, video or audio file"
+    "Attach an image, video or audio file": "Attach an image, video or audio file",
+    "Set a place and time": "Set a place and time"
 }
diff --git a/translations/pl.json b/translations/pl.json
index c8b247fbf..85c74a770 100644
--- a/translations/pl.json
+++ b/translations/pl.json
@@ -521,5 +521,6 @@
     "mitm": "Wiadomość mogła zostać przeczytana lub zmodyfikowana przez osobę trzecią",
     "Bold reading": "Odważne czytanie",
     "SHOW EDITS": "POKAŻ EDYCJE",
-    "Attach an image, video or audio file": "Dołącz obraz, plik wideo lub audio"
+    "Attach an image, video or audio file": "Dołącz obraz, plik wideo lub audio",
+    "Set a place and time": "Ustaw miejsce i czas"
 }
diff --git a/translations/pt.json b/translations/pt.json
index ef5632fb5..bfbe8b1e8 100644
--- a/translations/pt.json
+++ b/translations/pt.json
@@ -521,5 +521,6 @@
     "mitm": "A mensagem pode ter sido lida ou modificada por terceiros",
     "Bold reading": "Leitura em negrito",
     "SHOW EDITS": "MOSTRAR EDIÇÕES",
-    "Attach an image, video or audio file": "Anexe um arquivo de imagem, vídeo ou áudio"
+    "Attach an image, video or audio file": "Anexe um arquivo de imagem, vídeo ou áudio",
+    "Set a place and time": "Defina um local e hora"
 }
diff --git a/translations/ru.json b/translations/ru.json
index d1bf1fa5e..036b4e415 100644
--- a/translations/ru.json
+++ b/translations/ru.json
@@ -521,5 +521,6 @@
     "mitm": "Сообщение могло быть прочитано или изменено третьим лицом",
     "Bold reading": "Смелое чтение",
     "SHOW EDITS": "ПОКАЗАТЬ РЕДАКТИРОВАНИЕ",
-    "Attach an image, video or audio file": "Прикрепите изображение, видео или аудио файл"
+    "Attach an image, video or audio file": "Прикрепите изображение, видео или аудио файл",
+    "Set a place and time": "Назначить место и время"
 }
diff --git a/translations/sw.json b/translations/sw.json
index 1a5500fdf..f7f5060c4 100644
--- a/translations/sw.json
+++ b/translations/sw.json
@@ -521,5 +521,6 @@
     "mitm": "Ujumbe ungeweza kusomwa au kurekebishwa na mtu mwingine",
     "Bold reading": "Kusoma kwa ujasiri",
     "SHOW EDITS": "ONYESHA MABADILIKO",
-    "Attach an image, video or audio file": "Ambatisha picha, video au faili ya sauti"
+    "Attach an image, video or audio file": "Ambatisha picha, video au faili ya sauti",
+    "Set a place and time": "Weka mahali na wakati"
 }
diff --git a/translations/uk.json b/translations/uk.json
index a30b62c38..8dea89d41 100644
--- a/translations/uk.json
+++ b/translations/uk.json
@@ -521,5 +521,6 @@
     "mitm": "Повідомлення могло бути прочитане або змінене третьою стороною",
     "Bold reading": "Сміливе читання",
     "SHOW EDITS": "ПОКАЗАТИ ЗМІНИ",
-    "Attach an image, video or audio file": "Прикріпіть зображення, відео чи аудіофайл"
+    "Attach an image, video or audio file": "Прикріпіть зображення, відео чи аудіофайл",
+    "Set a place and time": "Встановіть місце і час"
 }
diff --git a/translations/zh.json b/translations/zh.json
index e1a3dcf82..a9ed4a854 100644
--- a/translations/zh.json
+++ b/translations/zh.json
@@ -521,5 +521,6 @@
     "mitm": "消息可能已被第三方阅读或修改",
     "Bold reading": "大胆阅读",
     "SHOW EDITS": "显示编辑",
-    "Attach an image, video or audio file": "附加图像、视频或音频文件"
+    "Attach an image, video or audio file": "附加图像、视频或音频文件",
+    "Set a place and time": "设置地点和时间"
 }
diff --git a/webapp_create_post.py b/webapp_create_post.py
index 2d327bc3e..1e9522254 100644
--- a/webapp_create_post.py
+++ b/webapp_create_post.py
@@ -632,6 +632,8 @@ def html_new_post(css_cache: {}, media_instance: bool, translate: {},
             replies_section += '</div>\n'
 
             date_and_location = \
+                begin_edit_section(translate['Set a place and time'])
+            date_and_location += \
                 '<div class="container">\n'
             if endpoint == 'newpost':
                 date_and_location += \
@@ -651,6 +653,7 @@ def html_new_post(css_cache: {}, media_instance: bool, translate: {},
         date_and_location += \
             edit_text_field(translate['Location'], 'location', '')
         date_and_location += '</div>\n'
+        date_and_location += end_edit_section()
 
     instance_title = get_config_param(base_dir, 'instanceTitle')
     new_post_form = html_header_with_external_style(css_filename,