diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 64e8be4a24..c7699d0bae 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -6,15 +6,6 @@
           <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
         </value>
       </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
@@ -40,4 +31,4 @@
       </indentOptions>
     </codeStyleSettings>
   </code_scheme>
-</component>
\ No newline at end of file
+</component>
diff --git a/src/main/java/com/owncloud/android/lib/resources/activities/models/PreviewObject.java b/src/main/java/com/owncloud/android/lib/resources/activities/models/PreviewObject.java
index 5022fa540c..0d05ffafab 100644
--- a/src/main/java/com/owncloud/android/lib/resources/activities/models/PreviewObject.java
+++ b/src/main/java/com/owncloud/android/lib/resources/activities/models/PreviewObject.java
@@ -44,4 +44,5 @@ public class PreviewObject {
     private Boolean mimeTypeIcon;
     private String mimeType;
     private String view;
+    private String filename;
 }
diff --git a/src/main/java/com/owncloud/android/lib/resources/activities/models/PreviewObjectAdapter.java b/src/main/java/com/owncloud/android/lib/resources/activities/models/PreviewObjectAdapter.java
index 3cad9da49a..36ef4a2c18 100644
--- a/src/main/java/com/owncloud/android/lib/resources/activities/models/PreviewObjectAdapter.java
+++ b/src/main/java/com/owncloud/android/lib/resources/activities/models/PreviewObjectAdapter.java
@@ -31,6 +31,8 @@
 
 import java.io.IOException;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 /**
  * PreviewList Parser
  */
@@ -59,13 +61,20 @@ public PreviewObject read(JsonReader in) throws IOException {
         return preview;
     }
 
+    @SuppressFBWarnings(value = "SF_SWITCH_NO_DEFAULT",
+            justification = "default case is not found correctly")
     private PreviewObject readObject(JsonReader in) throws IOException {
         String tag;
         PreviewObject preview = new PreviewObject();
 
         do {
-            tag = in.nextName();
-            
+            try {
+                tag = in.nextName();
+            } catch (IllegalStateException e) {
+                in.skipValue();
+                tag = "";
+            }
+
             switch (tag) {
                 case "source":
                     preview.setSource(in.nextString());
@@ -91,6 +100,9 @@ private PreviewObject readObject(JsonReader in) throws IOException {
                     preview.setView(in.nextString());
                     break;
 
+                case "filename":
+                    preview.setFilename(in.nextString());
+
                 default:
                     // do nothing
                     break;