diff --git a/news/templates/news_detail.html b/news/templates/news_detail.html
index 26f147a1..15eced7e 100644
--- a/news/templates/news_detail.html
+++ b/news/templates/news_detail.html
@@ -3,9 +3,9 @@
 
 {% block content %}
   <div>
-    {% if draft %}
+    {% if not_public %}
     <div class="alert alert-danger">
-      <strong>This news item is not yet public.</strong> It will become public at {{ news_item.published_at|date:'Y-m-d H:i' }}.
+      <strong>This news item is not yet public.</strong> {% if timed %}It will become public at {{ news_item.published_at|date:'Y-m-d H:i' }}.{% endif%}
     </div>
     {% endif %}
     <h3>{{ news_item.title }} <small>{{ news_item.published_at|date:"Y-m-d" }}</small></h3>
diff --git a/news/views.py b/news/views.py
index 3e2af89a..6755f2fe 100644
--- a/news/views.py
+++ b/news/views.py
@@ -18,8 +18,14 @@ class NewsDetail(DetailView):
     def get_context_data(self, **kwargs):
         context = super(NewsDetail, self).get_context_data(**kwargs)
         news_item = self.get_object()
-        context['draft'] = False
-        if news_item.public and news_item.published_at > timezone.now():
-            context['draft'] = True
+        timed = news_item.published_at > timezone.now()
+
+        if news_item.public and timed:
+            context['not_public'] = True
+            context['timed'] = True
+        elif not news_item.public:
+            context['not_public'] = True
+            context['timed'] = False
+
         return context