diff --git a/Riot/Modules/BugReport/BugReportViewController.h b/Riot/Modules/BugReport/BugReportViewController.h
index 7156396614..d7dcd78f1b 100644
--- a/Riot/Modules/BugReport/BugReportViewController.h
+++ b/Riot/Modules/BugReport/BugReportViewController.h
@@ -65,4 +65,11 @@
  */
 @property (nonatomic) BOOL reportCrash;
 
+// Tchap
+/**
+ Option to report a VoIP incident.
+ The crash log will sent in the report.
+ */
+@property (nonatomic) BOOL reportVoIPIncident;
+
 @end
diff --git a/Riot/Modules/BugReport/BugReportViewController.m b/Riot/Modules/BugReport/BugReportViewController.m
index da9d75995c..dd3e916dbc 100644
--- a/Riot/Modules/BugReport/BugReportViewController.m
+++ b/Riot/Modules/BugReport/BugReportViewController.m
@@ -23,6 +23,9 @@
 #import "RageShakeManager.h"
 #import "ThemeService.h"
 
+// Tchap: use AFNetworkReachability connection state in VoIP RageShake
+#import "AFNetworkReachabilityManager.h"
+
 @interface BugReportViewController ()
 {
     MXBugReportRestClient *bugReportRestClient;
@@ -84,7 +87,13 @@ - (void)viewDidLoad
     _bugReportDescriptionTextView.text = nil;
     _bugReportDescriptionTextView.delegate = self;
 
-    if (_reportCrash)
+    // Tchap: add `reportVoIPIncident` configuration
+    if (_reportVoIPIncident)
+    {
+        _titleLabel.text = [TchapL10n voidReportIncidentTitle];
+        _descriptionLabel.text = [TchapL10n voidReportIncidentDescription];
+    }
+    else if (_reportCrash)
     {
         _titleLabel.text = [VectorL10n bugCrashReportTitle];
         _descriptionLabel.text = [VectorL10n bugCrashReportDescription];
@@ -361,6 +370,21 @@ - (IBAction)onSendButtonPress:(id)sender
     NSMutableDictionary<NSString *, NSString *> *customFields = NSMutableDictionary.dictionary;
     customFields[@"email"] = mainAccount.linkedEmails.firstObject ?: @"undefined";
     
+    // Tchap : add "context: 'voip'" (if necessary) for support automation
+    if ( _reportVoIPIncident == YES ) {
+        customFields[@"context"] = @"voip";
+        
+        if ( AFNetworkReachabilityManager.sharedManager.isReachableViaWiFi ) {
+            customFields[@"connection"] = @"wifi";
+        }
+        else if ( AFNetworkReachabilityManager.sharedManager.isReachableViaWWAN ) {
+            customFields[@"connection"] = @"mobile";
+        }
+        else {
+            customFields[@"connection"] = @"unknown";
+        }
+    }
+    
     bugReportRestClient.others = userInfo;
 
     // Screenshot
@@ -388,7 +412,7 @@ - (IBAction)onSendButtonPress:(id)sender
                                             sendCrashLog:_reportCrash
                                                sendFiles:files
                                         additionalLabels:nil
-                                            customFields:customFields // Tchap : add custom fields (fro email actually)
+                                            customFields:customFields // Tchap : add custom fields (for email actually)
                                                 progress:^(MXBugReportState state, NSProgress *progress) {
         
         switch (state)
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index 63a47078ed..b0024715e8 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -3888,6 +3888,16 @@ - (void)dataSource:(MXKDataSource *)dataSource didRecognizeAction:(NSString *)ac
             MXCall *call = [self.mainSession.callManager callWithCallId:eventContent.callId];
             [call hangup];
         }
+        // Tchap: handle "rport VoIP incident" action
+        else if ([actionIdentifier isEqualToString:RoomDirectCallStatusCell.reportIncidentAction])
+        {
+            MXEvent *callInviteEvent = userInfo[kMXKRoomBubbleCellEventKey];
+            MXCallInviteEventContent *eventContent = [MXCallInviteEventContent modelFromJSON:callInviteEvent.content];
+
+            BugReportViewController *bugReportViewController = [BugReportViewController bugReportViewController];
+            bugReportViewController.reportVoIPIncident = YES;
+            [bugReportViewController showInViewController:self];
+        }
         else if ([actionIdentifier isEqualToString:RoomGroupCallStatusCell.joinAction] ||
                  [actionIdentifier isEqualToString:RoomGroupCallStatusCell.answerAction])
         {
diff --git a/Riot/Modules/Room/TimelineCells/Call/CallCellContentView.xib b/Riot/Modules/Room/TimelineCells/Call/CallCellContentView.xib
index 3a69de9b50..03c049087f 100644
--- a/Riot/Modules/Room/TimelineCells/Call/CallCellContentView.xib
+++ b/Riot/Modules/Room/TimelineCells/Call/CallCellContentView.xib
@@ -87,7 +87,7 @@
                                                         <constraint firstAttribute="height" constant="16" id="OdD-1h-kkV"/>
                                                     </constraints>
                                                 </imageView>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Active call" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A3h-4o-nXF">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" text="Active call" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A3h-4o-nXF">
                                                     <rect key="frame" x="22" y="0.0" width="62" height="16"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                     <nil key="textColor"/>
diff --git a/Riot/Modules/Room/TimelineCells/Call/Common/HorizontalButtonsContainerView.swift b/Riot/Modules/Room/TimelineCells/Call/Common/HorizontalButtonsContainerView.swift
index 94af7bd1c8..899ba5143e 100644
--- a/Riot/Modules/Room/TimelineCells/Call/Common/HorizontalButtonsContainerView.swift
+++ b/Riot/Modules/Room/TimelineCells/Call/Common/HorizontalButtonsContainerView.swift
@@ -33,6 +33,8 @@ class HorizontalButtonsContainerView: UIView {
         var result = stackView.intrinsicContentSize
         result.width = self.frame.width
         result.height += Constants.stackViewTopMargin + Constants.stackViewBottomMargin
+        // Tchap: set minimum height for buttons not to be vertically compressed when text above is multi-line.
+        result.height = max(result.height, 68.0)
         return result
     }
 
diff --git a/Riot/Modules/Room/TimelineCells/Call/Direct/RoomDirectCallStatusCell.swift b/Riot/Modules/Room/TimelineCells/Call/Direct/RoomDirectCallStatusCell.swift
index 20f7325569..84e3973e46 100644
--- a/Riot/Modules/Room/TimelineCells/Call/Direct/RoomDirectCallStatusCell.swift
+++ b/Riot/Modules/Room/TimelineCells/Call/Direct/RoomDirectCallStatusCell.swift
@@ -50,6 +50,13 @@ class RoomDirectCallStatusCell: RoomCallBaseCell {
         return self.className + ".endCall"
     }
     
+    // Tchap
+    /// Action identifier used when the user pressed "Report VoIP incident" button for an ended call.
+    /// The `userInfo` dictionary contains an `MXEvent` object under the `kMXKRoomBubbleCellEventKey` key, representing the invite event of the call.
+    static var reportIncidentAction: String {
+        return self.className + ".reportincident"
+    }
+    
     private var callDurationString: String = ""
     private var isVideoCall: Bool = false
     private var isIncoming: Bool = false
@@ -165,7 +172,18 @@ class RoomDirectCallStatusCell: RoomCallBaseCell {
             
             return view
         case .ended:
-            return nil
+            // Tchap: add "Report VoIP incident" button
+//            return nil
+            let view = HorizontalButtonsContainerView.loadFromNib()
+            view.secondButton.isHidden = true
+            
+            view.firstButton.style = .positive
+            view.firstButton.setTitle(TchapL10n.eventFormatterReportIncident, for: .normal)
+            view.firstButton.setImage(callButtonIcon, for: .normal)
+            view.firstButton.removeTarget(nil, action: nil, for: .touchUpInside)
+            view.firstButton.addTarget(self, action: #selector(reportIncidentAction(_:)), for: .touchUpInside)
+            
+            return view
         case .failed:
             let view = HorizontalButtonsContainerView.loadFromNib()
             view.secondButton.isHidden = true
@@ -332,6 +350,14 @@ class RoomDirectCallStatusCell: RoomCallBaseCell {
                             userInfo: actionUserInfo)
     }
     
+    // Tchap: report VoIP incident action
+    @objc
+    private func reportIncidentAction(_ sender: CallTileActionButton) {
+        self.delegate?.cell(self,
+                            didRecognizeAction: Self.reportIncidentAction,
+                            userInfo: actionUserInfo)
+    }
+    
     //  MARK: - MXKCellRendering
     
     override func render(_ cellData: MXKCellData!) {
diff --git a/Tchap/Assets/Localizations/fr.lproj/Tchap.strings b/Tchap/Assets/Localizations/fr.lproj/Tchap.strings
index cfccbd4e2d..d4b803f5fb 100644
--- a/Tchap/Assets/Localizations/fr.lproj/Tchap.strings
+++ b/Tchap/Assets/Localizations/fr.lproj/Tchap.strings
@@ -329,3 +329,9 @@
 "security_cross_signing_reset_title" = "Êtes-vous sur ?";
 "security_cross_signing_reset_message" = "Faites cette opération seulement si vous avez perdu tous vos autres appareils vérifiés.";
 "security_cross_signing_reset_action_title" = "Réinitialiser";
+
+////////////////////////////////////////////////////////////////////////////////
+// MARK: VoIP
+"event_formatter_report_incident" = "Signaler un problème";
+"void_report_incident_title" = "Signaler un problème VoIP";
+"void_report_incident_description" = "Vous avez rencontré un souci durant votre appel VoIP. Dites-nous ce qui s'est passé :";
diff --git a/changelog.d/962.feature b/changelog.d/962.feature
new file mode 100644
index 0000000000..b543c8c552
--- /dev/null
+++ b/changelog.d/962.feature
@@ -0,0 +1 @@
+Proposer d'envoyer un rapport d'incident/de qualité à la fin d'un appel VoIP
\ No newline at end of file