Merge branch 'trz/rebase' into trz/merge_1.11.1

1 files changed, 2 insertions, 2 deletions

diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
index 2fc4f3ef..93b68809 100644
--- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
@@ -110,7 +110,7 @@ public class FileBackend {
 	}
 
     public static DownloadableFile compressImageAndCopyToPrivateStorage(Message message, Bitmap scaledBitmap) throws FileCopyException {
-        message.setRelativeFilePath(FileBackend.getPrivateImageDirectoryPath() + message.getUuid() + ".png");
+        message.setRelativeFilePath(FileBackend.getPrivateImageDirectoryPath() + message.getUuid() + ".jpg");
         DownloadableFile file = getFile(message);
         file.getParentFile().mkdirs();
         OutputStream os = null;
@@ -118,7 +118,7 @@ public class FileBackend {
             file.createNewFile();
             os = new FileOutputStream(file);
 
-            boolean success = scaledBitmap.compress(Bitmap.CompressFormat.PNG, 75, os);
+            boolean success = scaledBitmap.compress(Bitmap.CompressFormat.JPEG, 75, os);
             if (!success) {
                 throw new FileCopyException(R.string.error_compressing_image);
             }