diff --git a/source/_layouts/post.html.twig b/source/_layouts/post.html.twig
index 20c798a5..e95ee869 100644
--- a/source/_layouts/post.html.twig
+++ b/source/_layouts/post.html.twig
@@ -5,24 +5,13 @@
     {% include 'post/intro-image' %}
 
     <div class="markdown mb-6">
-        {% set limit = 'now'|date_modify('-12 months')|date('U') %}
-        {% if page.date|date('U') < limit %}
-            <div class="border-2 border-blue p-4 mb-4">
-                <p class="mb-0">
-                    <span class="font-bold">Warning:</span> This post is over a year old. I don't always update old posts with new information, so some of this information may be out of date.
-                </p>
-            </div>
-        {% endif %}
-
+        {% include 'post/old-post-message' %}
         {{ page.summary|markdown }}
         {% block excerpt %}{% endblock %}
         {% block content %}{% endblock %}
     </div>
 
-    <div class="mb-4 italic text-grey-dark">
-        <p>Questions? Comments? I’m <a href="https://twitter.com/{{ site.twitter.name }}" class="link">@{{ site.twitter.name }}</a> on Twitter.</p>
-    </div>
-
+    {% include 'post/questions-comments' %}
     {% include 'post/tags' %}
     {% include 'post/pager' %}
     {% include 'post/about-author' %}
diff --git a/source/_partials/post/old-post-message.html.twig b/source/_partials/post/old-post-message.html.twig
new file mode 100644
index 00000000..ddf7acf5
--- /dev/null
+++ b/source/_partials/post/old-post-message.html.twig
@@ -0,0 +1,8 @@
+{% if page.date|date('U') < 'now'|date_modify('-12 months')|date('U') %}
+    <div class="border-2 border-blue p-4 mb-4">
+        <p class="mb-0">
+            <span class="font-bold">Warning:</span>
+            This post is over a year old. I don't always update old posts with new information, so some of this information may be out of date.
+        </p>
+    </div>
+{% endif %}
diff --git a/source/_partials/post/questions-comments.html.twig b/source/_partials/post/questions-comments.html.twig
new file mode 100644
index 00000000..fce9f03c
--- /dev/null
+++ b/source/_partials/post/questions-comments.html.twig
@@ -0,0 +1,3 @@
+<div class="mb-4 italic text-grey-dark">
+    <p>Questions? Comments? I’m <a href="https://twitter.com/{{ site.twitter.name }}" class="link">@{{ site.twitter.name }}</a> on Twitter.</p>
+</div>