diff --git a/templates/base.html b/templates/base.html
index e774badd8a6d058b93fc401d521a08d5b9f0fe43..78b4dd328c928d571010225a6b0a3bc70ced1678 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -109,7 +109,17 @@
 							<li>{{ valueeditor(('announcements',msg.id,'text'), msg.text|safe) }}</li>
 							{% if ismod() %}
 							<li class="pull-right">{{ valuedeletebtn(('announcements',msg.id,'deleted')) }}</li>
-							<li class="pull-right" style="padding-right: 5px;"><a href="{{ url_for('edit', ref=request.url) }}&announcements.{{ msg.id }}.visible=1" class="btn btn-primary {% if msg.visible %}disabled{% endif %}">Veröffentlichen</a></li>
+							<li class="pull-right" style="padding-right: 5px;">
+								{% if not msg.visible %}
+									<a href="{{ url_for('edit', ref=request.url) }}&announcements.{{ msg.id }}.visible=1" class="btn btn-primary">Veröffentlichen</a>
+								{% elif msg.time_expire and msg.time_expire < datetime.now() %}
+									<a href="#" class="btn btn-danger disabled">Abgelaufen</a>
+								{% elif msg.time_publish and msg.time_publish > datetime.now() %}
+									<a href="#" class="btn btn-default disabled">Geplant</a>
+								{% else %}
+									<a href="#" class="btn btn-success disabled">Öffentlich</a>
+								{% endif %}
+							</li>
 							<li class="dropdown pull-right" style="padding-right: 5px;">
 								<span class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown">{{levels.get(msg.level, ('', 'Unbekannt'))[1]}} <span class="caret"></span></span>
 								<ul class="dropdown-menu">