diff --git a/app/src/main/java/com/simplemobiletools/camera/PhotoProcessor.java b/app/src/main/java/com/simplemobiletools/camera/PhotoProcessor.java
index f68008e7..afe46567 100644
--- a/app/src/main/java/com/simplemobiletools/camera/PhotoProcessor.java
+++ b/app/src/main/java/com/simplemobiletools/camera/PhotoProcessor.java
@@ -2,7 +2,6 @@ package com.simplemobiletools.camera;
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Matrix;
 import android.hardware.Camera;
 import android.media.ExifInterface;
@@ -35,12 +34,13 @@ public class PhotoProcessor extends AsyncTask<byte[], Void, Void> {
             final File photoFile = new File(photoPath);
             final byte[] data = params[0];
             final FileOutputStream fos = new FileOutputStream(photoFile);
-            Bitmap bitmap = BitmapFactory.decodeByteArray(data, 0, data.length);
+            /*Bitmap bitmap = BitmapFactory.decodeByteArray(data, 0, data.length);
             bitmap = setBitmapRotation(bitmap, photoFile.toString());
             bitmap = setAspectRatio(bitmap);
             bitmap = checkLandscape(bitmap);
-            bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos);
+            bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos);*/
 
+            fos.write(data);
             fos.close();
             Utils.scanFile(photoPath, mContext);
         } catch (FileNotFoundException e) {
diff --git a/app/src/main/java/com/simplemobiletools/camera/Preview.java b/app/src/main/java/com/simplemobiletools/camera/Preview.java
index f2bda19f..0ad7cb9a 100644
--- a/app/src/main/java/com/simplemobiletools/camera/Preview.java
+++ b/app/src/main/java/com/simplemobiletools/camera/Preview.java
@@ -22,7 +22,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.OnTouchListener, OnLongClickListener, View.OnClickListener{
+public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.OnTouchListener, OnLongClickListener, View.OnClickListener {
     private static final String TAG = Preview.class.getSimpleName();
     private static final int FOCUS_AREA_SIZE = 200;
     private static final int PHOTO_PREVIEW_LENGTH = 1000;
@@ -93,8 +93,12 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
             if (focusModes.contains(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE))
                 parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE);
 
+            int rotation = getPreviewRotation(cameraId);
+            camera.setDisplayOrientation(rotation);
+
+            rotation = getPictureRotation(cameraId);
+            parameters.setRotation(rotation);
             camera.setParameters(parameters);
-            camera.setDisplayOrientation(getCameraRotation(cameraId));
 
             if (canTakePicture) {
                 try {
@@ -112,24 +116,9 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
             initRecorder();
     }
 
-    public static int getCameraRotation(int cameraId) {
+    private static int getPreviewRotation(int cameraId) {
         final Camera.CameraInfo info = Utils.getCameraInfo(cameraId);
-        int rotation = activity.getWindowManager().getDefaultDisplay().getRotation();
-        int degrees = 0;
-        switch (rotation) {
-            case Surface.ROTATION_0:
-                degrees = 0;
-                break;
-            case Surface.ROTATION_90:
-                degrees = 90;
-                break;
-            case Surface.ROTATION_180:
-                degrees = 180;
-                break;
-            case Surface.ROTATION_270:
-                degrees = 270;
-                break;
-        }
+        int degrees = getRotationDegrees();
 
         int result;
         if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
@@ -138,9 +127,36 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
         } else {
             result = (info.orientation - degrees + 360) % 360;
         }
+
         return result;
     }
 
+    private static int getPictureRotation(int cameraId) {
+        int degrees = getRotationDegrees();
+        final Camera.CameraInfo info = Utils.getCameraInfo(cameraId);
+        if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
+            return (360 + info.orientation + degrees) % 360;
+        }
+
+        return (360 + info.orientation - degrees) % 360;
+    }
+
+    private static int getRotationDegrees() {
+        int rotation = activity.getWindowManager().getDefaultDisplay().getRotation();
+        switch (rotation) {
+            case Surface.ROTATION_0:
+                return 0;
+            case Surface.ROTATION_90:
+                return 90;
+            case Surface.ROTATION_180:
+                return 180;
+            case Surface.ROTATION_270:
+                return 270;
+            default:
+                return 0;
+        }
+    }
+
     public void takePicture() {
         if (canTakePicture) {
             if (isFlashEnabled) {
@@ -148,6 +164,10 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
             } else {
                 parameters.setFlashMode(Camera.Parameters.FLASH_MODE_OFF);
             }
+
+            final Camera.Size maxPictureSize = parameters.getSupportedPictureSizes().get(0);
+            parameters.setPictureSize(maxPictureSize.width, maxPictureSize.height);
+
             MediaPlayer.create(getContext(), R.raw.camera_shutter).start();
             camera.setParameters(parameters);
             camera.takePicture(null, null, takePictureCallback);
@@ -284,9 +304,10 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
 
     @Override
     protected void onLayout(boolean changed, int l, int t, int r, int b) {
+
     }
 
-    private Camera.Size getOptimalPreviewSize(List<Camera.Size> sizes, int height, int width) {
+    private Camera.Size getOptimalPreviewSize(List<Camera.Size> sizes, int width, int height) {
         final double ASPECT_TOLERANCE = 0.1;
         double targetRatio = (double) height / width;
 
@@ -384,7 +405,7 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
         if (currCameraId == Camera.CameraInfo.CAMERA_FACING_FRONT) {
             recorder.setOrientationHint(270);
         } else {
-            recorder.setOrientationHint(getCameraRotation(currCameraId));
+            recorder.setOrientationHint(getPreviewRotation(currCameraId));
         }
 
         try {