vector-im/element-ios/issues/5114 - Polls in the timeline.

Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellDataWithAppendingMode.m

@@ -36,6 +36,11 @@ static NSAttributedString *messageSeparator = nil;
 
 - (BOOL)addEvent:(MXEvent*)event andRoomState:(MXRoomState*)roomState
 {
+    // Never merge polls
+    if (self.events.firstObject.eventType == MXEventTypePollStart) {
+        return NO;
+    }
+    
     // We group together text messages from the same user (attachments are not merged).
     if ([event.sender isEqualToString:self.senderId] && (self.attachment == nil) && (self.bubbleComponents.count < self.maxComponentCount))
     {
@@ -85,6 +90,11 @@ static NSAttributedString *messageSeparator = nil;
 
 - (BOOL)mergeWithBubbleCellData:(id<MXKRoomBubbleCellDataStoring>)bubbleCellData
 {
+    // Never merge polls
+    if (self.events.firstObject.eventType == MXEventTypePollStart) {
+        return NO;
+    }
+    
     if ([self hasSameSenderAsBubbleCellData:bubbleCellData])
     {
         MXKRoomBubbleCellData *cellData = (MXKRoomBubbleCellData*)bubbleCellData;