diff --git a/assets/themes/postboxes/postboxes.json b/assets/themes/postboxes/postboxes.json
index bf926c07a..f32cbdfd0 100644
--- a/assets/themes/postboxes/postboxes.json
+++ b/assets/themes/postboxes/postboxes.json
@@ -256,6 +256,141 @@
               "hideInAnswer": "_country!=be"
             }
           ]
+        },
+        {
+          "id": "letter-from",
+          "render": {
+            "en": "You can post letters with these companies: {post_office:letter_from}"
+          },
+          "question": {
+            "en": "Can you post a letter here?"
+          },
+          "freeform": {
+            "key": "post_office:letter_from",
+            "type": "string"
+          },
+          "mappings": [
+            {
+              "if": "post_office:letter_from=yes",
+              "then": {
+                "en": "You can post letters here"
+              }
+            },
+            {
+              "if": "post_office:letter_from=no",
+              "then": {
+                "en": "You can't post letters here"
+              }
+            }
+          ]
+        },
+        {
+          "id": "parcel-from",
+          "render": {
+            "en": "You can post parcels with these companies: {post_office:parcel_from}"
+          },
+          "question": {
+            "en": "Can you send a parcel here?"
+          },
+          "freeform": {
+            "key": "post_office:parcel_from",
+            "type": "string"
+          },
+          "mappings": [
+            {
+              "if": "post_office:parcel_from=yes",
+              "then": {
+                "en": "You can send parcels here"
+              }
+            },
+            {
+              "if": "post_office:parcel_from=no",
+              "then": {
+                "en": "You can't send parcels here"
+              }
+            }
+          ]
+        },
+        {
+          "id": "parcel-pickup",
+          "render": {
+            "en": "You can pick up parcels from these companies: {post_office:parcel_pickup}"
+          },
+          "question": {
+            "en": "Can you pick up missed parcels here?"
+          },
+          "freeform": {
+            "key": "post_office:parcel_pickup",
+            "type": "string"
+          },
+          "mappings": [
+            {
+              "if": "post_office:parcel_pickup=yes",
+              "then": {
+                "en": "You can pick up missed parcels here"
+              }
+            },
+            {
+              "if": "post_office:parcel_pickup=no",
+              "then": {
+                "en": "You can't pick up missed parcels here"
+              }
+            }
+          ]
+        },
+        {
+          "id": "parcel-to",
+          "render": {
+            "en": "You can send parcels to here for pickup with these companies: {post_office:parcel_to}"
+          },
+          "question": {
+            "en": "Can you send parcels to here for pickup?"
+          },
+          "freeform": {
+            "key": "post_office:parcel_to",
+            "type": "string"
+          },
+          "mappings": [
+            {
+              "if": "post_office:parcel_to=yes",
+              "then": {
+                "en": "You can send parcels to here for pickup"
+              }
+            },
+            {
+              "if": "post_office:parcel_to=no",
+              "then": {
+                "en": "You can't send parcels to here for pickup"
+              }
+            }
+          ]
+        },
+        {
+          "id": "stamps",
+          "render": {
+            "en": "You can buy stamps from companies: {post_office:stamps}"
+          },
+          "question": {
+            "en": "Can you buy stamps here?"
+          },
+          "freeform": {
+            "key": "post_office:stamps",
+            "type": "string"
+          },
+          "mappings": [
+            {
+              "if": "post_office:stamps=yes",
+              "then": {
+                "en": "You can buy stamps here"
+              }
+            },
+            {
+              "if": "post_office:stamps=no",
+              "then": {
+                "en": "You can't buy stamps here"
+              }
+            }
+          ]
         }
       ],
       "presets": [
diff --git a/langs/themes/en.json b/langs/themes/en.json
index adc7c6dd1..d4bd6eedd 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -1217,6 +1217,54 @@
                         "question": "What are the opening hours for this post office?",
                         "render": "Opening Hours: {opening_hours_table()}"
                     },
+                    "letter-from": {
+                        "mappings": {
+                            "0": {
+                                "then": "You can post letters here"
+                            },
+                            "1": {
+                                "then": "You can't post letters here"
+                            }
+                        },
+                        "question": "Can you post a letter here?",
+                        "render": "You can post letters with these companies: {post_office:letter_from}"
+                    },
+                    "parcel-from": {
+                        "mappings": {
+                            "0": {
+                                "then": "You can send parcels here"
+                            },
+                            "1": {
+                                "then": "You can't send parcels here"
+                            }
+                        },
+                        "question": "Can you send a parcel here?",
+                        "render": "You can post parcels with these companies: {post_office:parcel_from}"
+                    },
+                    "parcel-pickup": {
+                        "mappings": {
+                            "0": {
+                                "then": "You can pick up missed parcels here"
+                            },
+                            "1": {
+                                "then": "You can't pick up missed parcels here"
+                            }
+                        },
+                        "question": "Can you pick up missed parcels here?",
+                        "render": "You can pick up parcels from these companies: {post_office:parcel_pickup}"
+                    },
+                    "parcel-to": {
+                        "mappings": {
+                            "0": {
+                                "then": "You can send parcels to here for pickup"
+                            },
+                            "1": {
+                                "then": "You can't send parcels to here for pickup"
+                            }
+                        },
+                        "question": "Can you send parcels to here for pickup?",
+                        "render": "You can send parcels to here for pickup with these companies: {post_office:parcel_to}"
+                    },
                     "partner-brand": {
                         "mappings": {
                             "0": {
@@ -1246,6 +1294,18 @@
                         },
                         "question": "For which brand does this location offer services?",
                         "render": "This location offers services for {post_office:brand}"
+                    },
+                    "stamps": {
+                        "mappings": {
+                            "0": {
+                                "then": "You can buy stamps here"
+                            },
+                            "1": {
+                                "then": "You can't buy stamps here"
+                            }
+                        },
+                        "question": "Can you buy stamps here?",
+                        "render": "You can buy stamps from companies: {post_office:stamps}"
                     }
                 },
                 "title": {