diff --git a/bwi/PollParticipantDetails/PollParticipantDetailsModels.swift b/bwi/PollParticipantDetails/PollParticipantDetailsModels.swift
index 2a8f11599..a4ea25ae5 100644
--- a/bwi/PollParticipantDetails/PollParticipantDetailsModels.swift
+++ b/bwi/PollParticipantDetails/PollParticipantDetailsModels.swift
@@ -49,8 +49,15 @@ struct PollParticipantVoter: Identifiable, BindableState {
             let dateFormatter = DateFormatter()
             dateFormatter.timeZone = TimeZone.current
             dateFormatter.calendar = Calendar.current
-            dateFormatter.dateFormat = "dd. MMMM, yyyy HH:mm"
-            let strDate = dateFormatter.string(from: votingTime)
+            var strDate = ""
+            if Calendar.current.isDateInToday(votingTime) {
+                dateFormatter.dateFormat = "HH:mm"
+                strDate = "Heute, ".appending(dateFormatter.string(from: votingTime))
+            } else {
+                dateFormatter.dateFormat = "E, d. MMM yyyy, HH:mm"
+                strDate = dateFormatter.string(from: votingTime)
+            }
+            strDate.append(contentsOf: " Uhr")
             
             return PollParticipantVoter(displayName: user.displayname, userAvatarData: avatarData, formattedVotingTime: strDate)
         } else {
diff --git a/bwi/PollParticipantDetails/PollParticipantDetailsView.swift b/bwi/PollParticipantDetails/PollParticipantDetailsView.swift
index 7b9bb6c4a..0990f411a 100644
--- a/bwi/PollParticipantDetails/PollParticipantDetailsView.swift
+++ b/bwi/PollParticipantDetails/PollParticipantDetailsView.swift
@@ -86,6 +86,7 @@ struct PollParticipantVoterView: View {
                     .font(theme.fonts.footnote)
                     .foregroundColor(theme.colors.secondaryContent)
             }
+            Spacer()
         }
     }
 }