diff --git a/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java b/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java
index 0f70fb5623..16e7bc425e 100644
--- a/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java
+++ b/termux-shared/src/main/java/com/termux/shared/models/ReportInfo.java
@@ -1,9 +1,14 @@
 package com.termux.shared.models;
 
+import android.util.Pair;
+
 import com.termux.shared.markdown.MarkdownUtils;
 import com.termux.shared.android.AndroidUtils;
+import com.termux.shared.net.socket.local.LocalClientSocket;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * An object that stored info for {@link com.termux.shared.activities.ReportActivity}.
@@ -71,6 +76,20 @@ public void setReportSaveFilePath(String reportSaveFilePath) {
         this.reportSaveFilePath = reportSaveFilePath;
     }
 
+    /**
+     * Get log variables {@link List < Pair <String, Object>>} for {@link ReportInfo}.
+     *
+     * @return Returns the log variables in list {@link List< Pair <String, Object>>}.
+     */
+    private static List<Pair<String, Object>> getLogVariableList(final ReportInfo reportInfo) {
+        List<Pair<String, Object>> logVariableList = new ArrayList<Pair<String, Object>>() {{
+            add(Pair.create("User Action", reportInfo.userAction));
+            add(Pair.create("Sender", reportInfo.sender));
+            add(Pair.create("Report Timestamp", reportInfo.reportTimestamp));
+        }};
+        return logVariableList;
+    }
+
     /**
      * Get a markdown {@link String} for {@link ReportInfo}.
      *
@@ -84,9 +103,11 @@ public static String getReportInfoMarkdownString(final ReportInfo reportInfo) {
 
         if (reportInfo.addReportInfoHeaderToMarkdown) {
             markdownString.append("## Report Info\n\n");
-            markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("User Action", reportInfo.userAction, "-"));
-            markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Sender", reportInfo.sender, "-"));
-            markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry("Report Timestamp", reportInfo.reportTimestamp, "-"));
+
+            for (Pair<String, Object> logVar: getLogVariableList(reportInfo)) {
+                markdownString.append("\n").append(MarkdownUtils.getSingleLineMarkdownStringEntry(logVar.first, logVar.second, "-"));
+            }
+
             markdownString.append("\n##\n\n");
         }