diff --git a/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m b/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
index 19f093a5d..21be58eb1 100644
--- a/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
+++ b/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
@@ -1613,7 +1613,14 @@ static NSString *const kHTMLATagRegexPattern = @"<a href=(?:'|\")(.*?)(?:'|\")>(
                 return nil;
             }
             
-            displayText = [VectorL10n pollTimelineEndedText];
+            MXEvent* pollStartedEvent = [self->mxSession.store eventWithEventId:event.relatesTo.eventId inRoom:event.roomId];
+            
+            if (pollStartedEvent) {
+                displayText = [MXEventContentPollStart modelFromJSON:pollStartedEvent.content].question;
+            } else {
+                displayText = [VectorL10n pollTimelineEndedText];
+            }
+            
             break;
         }
         case MXEventTypePollStart: