diff --git a/src/com/owncloud/android/lib/common/network/WebdavEntry.java b/src/com/owncloud/android/lib/common/network/WebdavEntry.java
index 4363c263..8deb7e22 100644
--- a/src/com/owncloud/android/lib/common/network/WebdavEntry.java
+++ b/src/com/owncloud/android/lib/common/network/WebdavEntry.java
@@ -53,7 +53,7 @@ public class WebdavEntry {
 
 	private String mName, mPath, mUri, mContentType, mEtag, mPermissions, mRemoteId;
 	private long mContentLength, mCreateTimestamp, mModifiedTimestamp, mSize;
-    private long mQuotaUsedBytes, mQuotaAvailableBytes;
+    private BigDecimal mQuotaUsedBytes, mQuotaAvailableBytes;
 
 	public WebdavEntry(MultiStatusResponse ms, String splitElement) {
         resetData();
@@ -137,10 +137,9 @@ public class WebdavEntry {
             if (prop != null) {
                 String quotaUsedBytesSt = (String) prop.getValue();
                 try {
-                    mQuotaUsedBytes = Long.parseLong(quotaUsedBytesSt);
+                    mQuotaUsedBytes = new BigDecimal(quotaUsedBytesSt);
                 } catch (NumberFormatException e) {
-                    BigDecimal bd = new BigDecimal(quotaUsedBytesSt);
-                    mQuotaUsedBytes = bd.longValue();
+                    Log_OC.w(TAG, "No value for QuotaUsedBytes");
                 }
                 Log_OC.d(TAG , "QUOTA_USED_BYTES " + quotaUsedBytesSt );
             }
@@ -150,10 +149,9 @@ public class WebdavEntry {
             if (prop != null) {
                 String quotaAvailableBytesSt = (String) prop.getValue();
                 try {
-                    mQuotaAvailableBytes = Long.parseLong(quotaAvailableBytesSt);
-               } catch (NumberFormatException e) {
-                    BigDecimal bd = new BigDecimal(quotaAvailableBytesSt);
-                    mQuotaAvailableBytes = bd.longValue();
+                    mQuotaAvailableBytes = new BigDecimal(quotaAvailableBytesSt);
+                } catch (NumberFormatException e) {
+                    Log_OC.w(TAG, "No value for QuotaAvailableBytes");
                 }
                 Log_OC.d(TAG , "QUOTA_AVAILABLE_BYTES " + quotaAvailableBytesSt );
             }
@@ -241,11 +239,11 @@ public class WebdavEntry {
         return mSize;
     }
 
-    public long quotaUsedBytes() {
+    public BigDecimal quotaUsedBytes() {
         return mQuotaUsedBytes;
     }
 
-    public long quotaAvailableBytes() {
+    public BigDecimal quotaAvailableBytes() {
         return mQuotaAvailableBytes;
     }
 
@@ -253,7 +251,7 @@ public class WebdavEntry {
         mName = mUri = mContentType = mPermissions = null; mRemoteId = null;
         mContentLength = mCreateTimestamp = mModifiedTimestamp = 0;
         mSize = 0;
-        mQuotaUsedBytes = 0;
-        mQuotaAvailableBytes = 0;
+        mQuotaUsedBytes = null;
+        mQuotaAvailableBytes = null;
     }
 }
diff --git a/src/com/owncloud/android/lib/resources/files/RemoteFile.java b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
index 1a5d13f9..6be850b2 100644
--- a/src/com/owncloud/android/lib/resources/files/RemoteFile.java
+++ b/src/com/owncloud/android/lib/resources/files/RemoteFile.java
@@ -25,6 +25,7 @@
 package com.owncloud.android.lib.resources.files;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -51,8 +52,8 @@ public class RemoteFile implements Parcelable, Serializable {
 	private String mPermissions;
 	private String mRemoteId;
     private long mSize;
-    private long mQuotaUsedBytes;
-    private long mQuotaAvailableBytes;
+    private BigDecimal mQuotaUsedBytes;
+    private BigDecimal mQuotaAvailableBytes;
 
 	/** 
 	 * Getters and Setters
@@ -130,11 +131,11 @@ public class RemoteFile implements Parcelable, Serializable {
         mSize = size;
     }
 
-    public void setQuotaUsedBytes (long quotaUsedBytes) {
+    public void setQuotaUsedBytes (BigDecimal quotaUsedBytes) {
         mQuotaUsedBytes = quotaUsedBytes;
     }
 
-    public void setQuotaAvailableBytes (long quotaAvailableBytes) {
+    public void setQuotaAvailableBytes (BigDecimal quotaAvailableBytes) {
         mQuotaAvailableBytes = quotaAvailableBytes;
     }
 
@@ -184,8 +185,8 @@ public class RemoteFile implements Parcelable, Serializable {
         mPermissions = null;
         mRemoteId = null;
         mSize = 0;
-        mQuotaUsedBytes = 0;
-        mQuotaAvailableBytes = 0;
+        mQuotaUsedBytes = null;
+        mQuotaAvailableBytes = null;
     }
 
     /** 
@@ -223,8 +224,8 @@ public class RemoteFile implements Parcelable, Serializable {
         mPermissions= source.readString();
         mRemoteId = source.readString();
         mSize = source.readLong();
-        mQuotaUsedBytes = source.readLong();
-        mQuotaAvailableBytes = source.readLong();
+        mQuotaUsedBytes = (BigDecimal) source.readSerializable();
+        mQuotaAvailableBytes = (BigDecimal) source.readSerializable();
     }
     
 	@Override
@@ -243,8 +244,8 @@ public class RemoteFile implements Parcelable, Serializable {
 		dest.writeString(mPermissions);
 		dest.writeString(mRemoteId);
         dest.writeLong(mSize);
-        dest.writeLong(mQuotaUsedBytes);
-        dest.writeLong(mQuotaAvailableBytes);
+        dest.writeSerializable(mQuotaUsedBytes);
+        dest.writeSerializable(mQuotaAvailableBytes);
 	}
 
 }