diff --git a/locale/de_DE/LC_MESSAGES/The Legend of Z.mo b/locale/de_DE/LC_MESSAGES/The Legend of Z.mo
index 0a8a37e0..85a73a5b 100644
Binary files a/locale/de_DE/LC_MESSAGES/The Legend of Z.mo and b/locale/de_DE/LC_MESSAGES/The Legend of Z.mo differ
diff --git a/locale/de_DE/LC_MESSAGES/The Legend of Z.po b/locale/de_DE/LC_MESSAGES/The Legend of Z.po
index bda0044d..6d5b9788 100644
--- a/locale/de_DE/LC_MESSAGES/The Legend of Z.po	
+++ b/locale/de_DE/LC_MESSAGES/The Legend of Z.po	
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: The Legend of Z\n"
-"POT-Creation-Date: 2014-05-01 14:29+0100\n"
-"PO-Revision-Date: 2014-05-01 14:29+0100\n"
+"POT-Creation-Date: 2014-05-01 21:12+0100\n"
+"PO-Revision-Date: 2014-05-01 21:12+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -87,6 +87,7 @@ msgid "Past submissions"
 msgstr "Vorherige Lösungen"
 
 #: questtypes/submit/html/quest.tpl:33 questtypes/submit/html/submission.tpl:6
+#: views/html/quests/submissions.tpl:15
 #, php-format
 msgid "submitted at %s on %s h"
 msgstr "eingereicht am %s um %s Uhr"
@@ -96,22 +97,26 @@ msgid "This submission is waiting for approval"
 msgstr "Die Lösung wartet auf Bewertung"
 
 #: questtypes/submit/html/quest.tpl:42
+#, php-format
+msgid "Approved on %s at %s"
+msgstr "Bewertet am %s um %s Uhr"
+
 #: questtypes/submit/html/submission.tpl:12
 #, php-format
-msgid "Comment from %s on %s at %s"
-msgstr "Kommentar von %s am %s um %s Uhr"
+msgid "Approved by %s on %s at %s"
+msgstr "Bewertet von %s am %s um %s Uhr"
 
 #: questtypes/submit/html/submission.tpl:27
 msgid "Comment"
 msgstr "Kommentar"
 
 #: questtypes/submit/html/submission.tpl:30 views/html/quests/quest.tpl:45
-#: views/html/quests/submissions.tpl:28
+#: views/html/quests/submissions.tpl:29
 msgid "solved"
 msgstr "Richtig!"
 
 #: questtypes/submit/html/submission.tpl:31 views/html/quests/quest.tpl:50
-#: views/html/quests/submissions.tpl:19
+#: views/html/quests/submissions.tpl:20
 msgid "unsolved"
 msgstr "Leider falsch!"
 
diff --git a/questtypes/submit/html/quest.tpl b/questtypes/submit/html/quest.tpl
index 6c5de4ba..d8b6b992 100644
--- a/questtypes/submit/html/quest.tpl
+++ b/questtypes/submit/html/quest.tpl
@@ -27,11 +27,11 @@
 <?php if(count($submissions) > 0) : ?>
 <h2><?=_('Past submissions')?></h2>
 <ol>
-	<?php foreach($submissions as &$submission) : ?>
+	<?php foreach($submissions as $index => &$submission) : ?>
 	<li>
 		<a href="<?=$linker->link(array('uploads','seminary',$seminary['url'], $submission['upload']['url']))?>"><?=$submission['upload']['name']?></a><br />
 		<?=sprintf(_('submitted at %s on %s h'), $dateFormatter->format(new \DateTime($submission['created'])), $timeFormatter->format(new \DateTime($submission['created'])))?><br />
-		<?php if($lastStatus['status'] == 1) : ?>
+		<?php if($lastStatus['status'] == 1 && $index > 0) : ?>
 		<?=_('This submission is waiting for approval')?>
 		<?php endif ?>
 		<?php if(count($submission['comments']) >  0) : ?>
@@ -39,9 +39,11 @@
 			<?php foreach($submission['comments'] as &$comment) : ?>
 			<li>
 				<?php if(array_key_exists('user', $comment) && array_key_exists('character', $comment['user'])) : ?>
-				<?=sprintf(_('Comment from %s on %s at %s'), $comment['user']['character']['name'], $dateFormatter->format(new \DateTime($comment['created'])), $timeFormatter->format(new \DateTime($comment['created'])))?>:<br />
+				<p class="fwb"><?=sprintf(_('Approved on %s at %s'), $dateFormatter->format(new \DateTime($comment['created'])), $timeFormatter->format(new \DateTime($comment['created'])))?></p>
 				<?php endif ?>
+				<?php if(!empty($comment['comment'])) : ?>
 				<?=\hhu\z\Utils::t($comment['comment'])?>
+				<?php endif ?>
 			</li>
 			<?php endforeach ?>
 		</ol>
diff --git a/questtypes/submit/html/submission.tpl b/questtypes/submit/html/submission.tpl
index da978a66..e985f56e 100644
--- a/questtypes/submit/html/submission.tpl
+++ b/questtypes/submit/html/submission.tpl
@@ -9,7 +9,7 @@
 			<?php foreach($submission['comments'] as &$comment) : ?>
 			<li>
 				<?php if(array_key_exists('user', $comment) && array_key_exists('character', $comment['user'])) : ?>
-				<p class="fwb"><?=sprintf(_('Comment from %s on %s at %s'), $comment['user']['character']['name'], $dateFormatter->format(new \DateTime($comment['created'])), $timeFormatter->format(new \DateTime($comment['created'])))?>:</p>
+				<p class="fwb"><?=sprintf(_('Approved by %s on %s at %s'), $comment['user']['character']['name'], $dateFormatter->format(new \DateTime($comment['created'])), $timeFormatter->format(new \DateTime($comment['created'])))?></p>
 				<?php endif ?>
 				<p><?=\hhu\z\Utils::t($comment['comment'])?></p>
 			</li>