diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
index 201a9c29..9a5f3c1d 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
@@ -90,6 +90,7 @@ import java.io.OutputStream;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Locale;
 
 import butterknife.Bind;
 import butterknife.ButterKnife;
@@ -442,7 +443,7 @@ public class MainActivity extends AppCompatActivity
 
     private File createImageFile() throws IOException {
         // Create an image file name
-        String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
+        String timeStamp = new SimpleDateFormat("dd-MM-yy_HH-mm", Locale.getDefault()).format(new Date());
         String imageFileName = "JPEG_" + timeStamp + "_";
         File storageDir = Environment.getExternalStoragePublicDirectory(
                 Environment.DIRECTORY_PICTURES);
@@ -625,14 +626,17 @@ public class MainActivity extends AppCompatActivity
                                             return;
                                         }
                                     }
-                                    Snackbar.make(swipeRefreshLayout, R.string.toast_screenshot, Snackbar.LENGTH_LONG).show();
+
                                     File directory = new File(Environment.getExternalStorageDirectory() + "/Pictures/Diaspora/");
                                     if (!directory.exists()) {
                                         directory.mkdirs();
                                     }
 
                                     Date date = new Date();
-                                    DateFormat dateFormat = android.text.format.DateFormat.getDateFormat(getApplicationContext());
+                                    DateFormat dateFormat = new SimpleDateFormat("dd-MM-yy_HH-mm", Locale.getDefault());
+
+                                    String filename = getString(R.string.toast_screenshot) + " " + Environment.getExternalStorageDirectory() + "/Pictures/Diaspora/" + dateFormat.format(date) + ".jpg";
+                                    Snackbar.make(swipeRefreshLayout, filename, Snackbar.LENGTH_LONG).show();
 
                                     webView.measure(View.MeasureSpec.makeMeasureSpec(
                                             View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED),
@@ -704,14 +708,17 @@ public class MainActivity extends AppCompatActivity
                                             return;
                                         }
                                     }
-                                    Snackbar.make(swipeRefreshLayout, R.string.toast_screenshot, Snackbar.LENGTH_LONG).show();
+
                                     File directory = new File(Environment.getExternalStorageDirectory() + "/Pictures/Diaspora/");
                                     if (!directory.exists()) {
                                         directory.mkdirs();
                                     }
 
                                     Date date = new Date();
-                                    DateFormat dateFormat = android.text.format.DateFormat.getDateFormat(getApplicationContext());
+                                    DateFormat dateFormat = new SimpleDateFormat("dd-MM-yy_HH-mm", Locale.getDefault());
+
+                                    String filename = getString(R.string.toast_screenshot) + " " + Environment.getExternalStorageDirectory() + "/Pictures/Diaspora/" + dateFormat.format(date) + ".jpg";
+                                    Snackbar.make(swipeRefreshLayout, filename, Snackbar.LENGTH_LONG).show();
 
                                     webView.measure(View.MeasureSpec.makeMeasureSpec(
                                             View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED),
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 3b4ef40a..f994cb85 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -76,8 +76,8 @@
     <string name="jb_share">Inhalt Teilen</string>
     <string name="share_link">Link als Text teilen</string>
     <string name="share_screenshot">Bildschirmfoto teilen</string>
-    <string name="take_screenshot">Bildschirmfoto machen</string>
-    <string name="toast_screenshot">Bildschirmfoto wird gespeichert…</string>
+    <string name="take_screenshot">Bildschirmfoto speichern</string>
+    <string name="toast_screenshot">Bildschirmfoto wird gespeichert unter:</string>
     <string name="jb_settings_diaspora">Diaspora Einstellungen</string>
     <string name="jb_settings_view">Ansichtseinstellungen</string>
     <string name="help_help">Markdown Formatierung</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 50c880cb..64dcaf0f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -78,7 +78,7 @@
     <string name="help_help">Markdown formating</string>
     <string name="help_about">Changelog</string>
 
-    <string name="toast_screenshot">Taking screenshot …</string>
+    <string name="toast_screenshot">Saving screenshot as:</string>
 
 
     // Floating Action Buttons - Titles