diff --git a/app/src/main/java/com/gh4a/fragment/IssueFragmentBase.java b/app/src/main/java/com/gh4a/fragment/IssueFragmentBase.java
index 22bae7af7..7fb80acfa 100644
--- a/app/src/main/java/com/gh4a/fragment/IssueFragmentBase.java
+++ b/app/src/main/java/com/gh4a/fragment/IssueFragmentBase.java
@@ -17,6 +17,7 @@
 
 import android.app.Activity;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.graphics.Typeface;
 import android.os.Bundle;
 import android.os.Parcelable;
@@ -74,6 +75,8 @@
 import io.reactivex.Single;
 import retrofit2.Response;
 
+import static android.content.Context.MODE_PRIVATE;
+
 public abstract class IssueFragmentBase extends ListDataBaseFragment<TimelineItem> implements
         View.OnClickListener, TimelineItemAdapter.OnCommentAction,
         ConfirmationDialogFragment.Callback,
@@ -228,11 +231,20 @@ public void onRefresh() {
         super.onRefresh();
     }
 
+    private SharedPreferences spGen;
+
+    private boolean isSend;
+
     @Override
     public void onResume() {
         super.onResume();
         mImageGetter.resume();
         mAdapter.resume();
+        spGen = getActivity().getSharedPreferences("IssueFragmentBase", MODE_PRIVATE);
+        if(spGen.getString("editRepoOwner", "").equals(mRepoOwner) && spGen.getString("editRepoName", "").equals(mRepoName)) {
+            addText(spGen.getString("editMessage", ""));
+        }
+        isSend = false;
     }
 
     @Override
@@ -240,6 +252,15 @@ public void onPause() {
         super.onPause();
         mImageGetter.pause();
         mAdapter.pause();
+        SharedPreferences.Editor spGenEditor = spGen.edit();
+        spGenEditor.putString("editRepoOwner", mRepoOwner);
+        spGenEditor.putString("editRepoName", mRepoName);
+        if (isSend) {
+            spGenEditor.putString("editMessage", "");
+        } else {
+            spGenEditor.putString("editMessage", mBottomSheet.getText().toString());
+        }
+        spGenEditor.commit();
     }
 
     @Override
@@ -561,6 +582,7 @@ public void onEditorTextSent() {
         // reload comments
         if (isAdded()) {
             reloadEvents(false);
+            isSend = true;
         }
         getActivity().setResult(Activity.RESULT_OK);
     }
diff --git a/app/src/main/java/com/gh4a/widget/EditorBottomSheet.java b/app/src/main/java/com/gh4a/widget/EditorBottomSheet.java
index 2560f4b1e..27756b043 100644
--- a/app/src/main/java/com/gh4a/widget/EditorBottomSheet.java
+++ b/app/src/main/java/com/gh4a/widget/EditorBottomSheet.java
@@ -367,6 +367,13 @@ private Editable getCommentText() {
         return mBasicEditor.getText();
     }
 
+    public Editable getText() {
+        if (isInAdvancedMode()) {
+            return mAdvancedEditor.getText();
+        }
+        return mBasicEditor.getText();
+    }
+
     private void setAdvancedEditorVisible(boolean visible) {
         mAdvancedEditorContainer.setVisibility(visible ? View.VISIBLE : View.GONE);
         mBasicEditorScrollView.setVisibility(visible ? View.GONE : View.VISIBLE);