diff --git a/templates/_checked_in.html.ep b/templates/_checked_in.html.ep
index f915769..7ebc318 100644
--- a/templates/_checked_in.html.ep
+++ b/templates/_checked_in.html.ep
@@ -245,7 +245,12 @@
 				% }
 				<a class="action-share blue-text right"
 					style="margin-right: 0;"
-					data-text="Ich bin gerade <%= $attrib %> <%= $journey->{train_type} %> <%= $journey->{train_no} %> nach <%= $journey->{arr_name} %> #NowTräwelling #dbl"
+					% if (current_user()->{is_public} & 0x04 and $journey->{comment}) {
+						data-text="<%= $journey->{comment} %> (@ <%= $journey->{train_type} %> <%= $journey->{train_no} %> → <%= $journey->{arr_name} %>) #NowTräwelling #dbl"
+					% }
+					% else {
+						data-text="Ich bin gerade <%= $attrib %> <%= $journey->{train_type} %> <%= $journey->{train_no} %> nach <%= $journey->{arr_name} %> #NowTräwelling #dbl"
+					% }
 					% if (current_user()->{is_public} & 0x02) {
 						data-url="<%= url_for('/status')->to_abs->scheme('https') %>/<%= current_user->{name} %>/<%= $journey->{sched_departure}->epoch %>"
 					% }