diff --git a/res/menu/view_log.xml b/res/menu/view_log.xml
index a067a9796..1750e04d1 100644
--- a/res/menu/view_log.xml
+++ b/res/menu/view_log.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:id="@+id/save_log"
+        android:title="@string/menu_save_log"
+        android:icon="@drawable/ic_save_white_24dp"
+        app:showAsAction="always"/>
     <item android:title="@string/menu_copy_to_clipboard"
         android:id="@+id/copy_log_to_clipboard" />
     <item android:title="@string/menu_zoom_in"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index afb5438e4..be4bf8ec6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -154,6 +154,7 @@
     <string name="menu_view_profile">View profile</string>
     <string name="menu_zoom_in">Zoom in</string>
     <string name="menu_zoom_out">Zoom out</string>
+    <string name="menu_save_log">Save log</string>
     <string name="title_share_location">Share location with all group members</string>
 
     <string name="mute_for_one_hour">Mute for 1 hour</string>
@@ -400,6 +401,8 @@
     <string name="pref_in_chat_sounds">In-chat sounds</string>
     <string name="pref_message_text_size">Message font size</string>
     <string name="pref_view_log">View log</string>
+    <string name="pref_saved_log">Saved the log to Downloads folder</string>
+    <string name="pref_save_log_failed">Failed to save the log</string>
     <string name="pref_log_header">Log</string>
     <string name="pref_other">Other</string>
     <string name="pref_backup">Backup</string>
diff --git a/src/org/thoughtcrime/securesms/LogViewActivity.java b/src/org/thoughtcrime/securesms/LogViewActivity.java
index 534f7a266..ad6ca4c38 100644
--- a/src/org/thoughtcrime/securesms/LogViewActivity.java
+++ b/src/org/thoughtcrime/securesms/LogViewActivity.java
@@ -7,6 +7,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.widget.Toast;
 
+import org.thoughtcrime.securesms.database.NoExternalStorageException;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.Util;
@@ -57,10 +58,22 @@ public class LogViewActivity extends BaseActionBarActivity {
   public boolean onOptionsItemSelected(MenuItem item) {
     super.onOptionsItemSelected(item);
     Float newSize;
+
     switch (item.getItemId()) {
       case android.R.id.home:
         finish();
         return true;
+      case R.id.save_log:
+        try {
+          if (logViewFragment.saveLogFile())
+            Toast.makeText(getApplicationContext(), R.string.pref_saved_log, Toast.LENGTH_LONG).show();
+          else
+            Toast.makeText(getApplicationContext(), R.string.pref_save_log_failed, Toast.LENGTH_LONG).show();
+        } catch (NoExternalStorageException e) {
+          e.printStackTrace();
+          Toast.makeText(getApplicationContext(), R.string.pref_save_log_failed, Toast.LENGTH_LONG).show();
+        }
+        return true;
       case R.id.copy_log_to_clipboard:
         Util.writeTextToClipboard(this, logViewFragment.getLogText());
         Toast.makeText(getApplicationContext(), R.string.done, Toast.LENGTH_SHORT).show();
diff --git a/src/org/thoughtcrime/securesms/LogViewFragment.java b/src/org/thoughtcrime/securesms/LogViewFragment.java
index c0c91ba98..1be203d31 100644
--- a/src/org/thoughtcrime/securesms/LogViewFragment.java
+++ b/src/org/thoughtcrime/securesms/LogViewFragment.java
@@ -39,12 +39,19 @@ import android.widget.EditText;
 import com.b44t.messenger.DcContext;
 
 import org.thoughtcrime.securesms.connect.DcHelper;
+import org.thoughtcrime.securesms.database.NoExternalStorageException;
 import org.thoughtcrime.securesms.util.Scrubber;
+import org.thoughtcrime.securesms.util.StorageUtil;
 
 import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.lang.ref.WeakReference;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Locale;
 
 public class LogViewFragment extends Fragment {
@@ -87,14 +94,49 @@ public class LogViewFragment extends Fragment {
 
   public Float getLogTextSize() { return logPreview.getTextSize(); }
 
-  public void setLogTextSize(Float Textsize) {
-    logPreview.setTextSize(TypedValue.COMPLEX_UNIT_PX, Textsize);
+  public void setLogTextSize(Float textSize) {
+    logPreview.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
   }
 
   public void scrollDownLog() { logPreview.setSelection(logPreview.getText().length()); }
 
   public void scrollUpLog() { logPreview.setSelection(0); }
 
+  public boolean saveLogFile() throws NoExternalStorageException {
+
+    File             outputDir   = null;
+    SimpleDateFormat dateFormat  = new SimpleDateFormat("yyyyMMdd-HHmmss");
+    Date             now         = new Date();
+    String           logFileName = "deltachat-log-" + dateFormat.format(now) + ".txt";
+
+    try {
+      outputDir = StorageUtil.getDownloadDir();
+      try {
+        String logText =  logPreview.getText().toString();
+        if(!logText.trim().equals("")){
+          File logFile = new File(outputDir + "/" + logFileName);
+
+          if(!logFile.exists()){
+            logFile.createNewFile();
+          }
+
+          FileWriter logFileWriter = new FileWriter(logFile, false);
+          BufferedWriter logFileBufferWriter = new BufferedWriter(logFileWriter);
+          logFileBufferWriter.write(logText);
+          logFileBufferWriter.close();
+        }
+      }
+      catch (IOException e) {
+        e.printStackTrace();
+        return false;
+      }
+    } catch (NoExternalStorageException e) {
+      e.printStackTrace();
+      return false;
+    }
+    return true;
+  }
+
   private static String grabLogcat() {
     try {
       final Process         process        = Runtime.getRuntime().exec("logcat -v threadtime -d");