diff --git a/document-picker/src/main/java/com/mobilejazz/coltrane/ui/DocumentBrowserActivity.java b/document-picker/src/main/java/com/mobilejazz/coltrane/ui/DocumentBrowserActivity.java
index 507b311..b29338e 100644
--- a/document-picker/src/main/java/com/mobilejazz/coltrane/ui/DocumentBrowserActivity.java
+++ b/document-picker/src/main/java/com/mobilejazz/coltrane/ui/DocumentBrowserActivity.java
@@ -327,7 +327,7 @@ public List<Root> loadInBackground() {
     }
 
     @Override
-    public void onLoadFinished(Loader<List<Root>> loader, List<Root> data) {
+    public void onLoadFinished(Loader<List<Root>> loader, final List<Root> data) {
         mDrawerAdapter.clear();
         mDrawerAdapter.addAll(data);
         populateRootIndices();
@@ -335,12 +335,16 @@ public void onLoadFinished(Loader<List<Root>> loader, List<Root> data) {
         mHandler.post(new Runnable() {
             @Override
             public void run() {
-                if (mSavedInstanceState == null) {
-                    selectItem(0);
+                if (data.size() > 0) {
+                    if (mSavedInstanceState == null) {
+                        selectItem(0);
+                    } else {
+                        int selected = mSavedInstanceState.getInt(SELECTED_ITEM);
+                        mCurrentDocumentId = mSavedInstanceState.getString(PATH);
+                        selectItem(selected);
+                    }
                 } else {
-                    int selected = mSavedInstanceState.getInt(SELECTED_ITEM);
-                    mCurrentDocumentId = mSavedInstanceState.getString(PATH);
-                    selectItem(selected);
+                    mNavigationAdapter.setHeader(getString(R.string.no_provider));
                 }
             }
         });
diff --git a/document-picker/src/main/res/values/strings.xml b/document-picker/src/main/res/values/strings.xml
index 2bb05b9..bc96a21 100644
--- a/document-picker/src/main/res/values/strings.xml
+++ b/document-picker/src/main/res/values/strings.xml
@@ -3,4 +3,5 @@
     <string name="open_from">Open from</string>
     <string name="drawer_open">Open Provider Selection</string>
     <string name="drawer_close">Close Provider Selection</string>
+    <string name="no_provider">No Provider Available</string>
 </resources>
diff --git a/document-picker/src/main/res/values/styles.xml b/document-picker/src/main/res/values/styles.xml
index fd27416..69312a3 100644
--- a/document-picker/src/main/res/values/styles.xml
+++ b/document-picker/src/main/res/values/styles.xml
@@ -17,6 +17,9 @@
         <item name="android:paddingRight">5dp</item>
         <item name="android:textSize">20dp</item>
         <item name="android:textColor">?android:attr/textColorHighlightInverse</item>
+
+        <item name="android:ellipsize">marquee</item>
+        <item name="android:singleLine">true</item>
     </style>
 
     <style name="TopNavigationEntryDropdown" parent="TopNavigationEntry">
diff --git a/example/build.gradle b/example/build.gradle
index 837c76d..f5faa79 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -42,4 +42,5 @@ dependencies {
     compile project(':filesystem')
     compile project(':gdrive')
     compile project(':document-picker')
+    compile 'com.squareup.picasso:picasso:2.4.0'
 }
diff --git a/example/src/main/AndroidManifest.xml b/example/src/main/AndroidManifest.xml
index 1e1d57c..5a9749d 100644
--- a/example/src/main/AndroidManifest.xml
+++ b/example/src/main/AndroidManifest.xml
@@ -17,16 +17,16 @@
  */
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mobilejazz.coltrane.example">
+    package="com.mobilejazz.coltrane.example" >
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <application
+        android:name=".ExampleApplication"
         android:allowBackup="true"
         android:hardwareAccelerated="true"
         android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:name=".ExampleApplication">
+        android:label="@string/app_name" >
         <activity
             android:name=".FileChooserExampleActivity"
             android:theme="@style/AppTheme" >
@@ -38,9 +38,9 @@
         </activity>
         <activity
             android:name="com.mobilejazz.coltrane.ui.DocumentBrowserActivity"
+            android:exported="true"
             android:label="@string/choose_file"
-            android:theme="@style/Theme.Lollipop"
-            android:exported="true">
+            android:theme="@style/Theme.Lollipop" >
             <intent-filter>
                 <action android:name="android.intent.action.GET_CONTENT" />
 
@@ -62,5 +62,12 @@
                 <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
             </intent-filter>
         </provider>
+
+        <activity
+            android:name=".FileDetailActivity"
+            android:label="@string/title_activity_file_detail"
+            android:theme="@style/AppTheme">
+        </activity>
     </application>
+
 </manifest>
\ No newline at end of file
diff --git a/example/src/main/java/com/mobilejazz/coltrane/example/FileChooserExampleActivity.java b/example/src/main/java/com/mobilejazz/coltrane/example/FileChooserExampleActivity.java
index c9c55ad..29beb62 100644
--- a/example/src/main/java/com/mobilejazz/coltrane/example/FileChooserExampleActivity.java
+++ b/example/src/main/java/com/mobilejazz/coltrane/example/FileChooserExampleActivity.java
@@ -105,9 +105,9 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                         // Get the URI of the selected file
                         Uri documentUri = data.getData();
                         try {
-                            Toast.makeText(FileChooserExampleActivity.this, "File Selected: " + documentUri, Toast.LENGTH_LONG).show();
-                            Intent view = new Intent(Intent.ACTION_VIEW);
+                            Intent view = new Intent(this, FileDetailActivity.class);
                             view.setDataAndType(data.getData(), data.getType());
+                            view.putExtras(data.getExtras());
                             startActivity(view);
                         } catch (Exception e) {
                             Log.e("FileSelectorTestActivity", "File select error", e);
diff --git a/example/src/main/java/com/mobilejazz/coltrane/example/FileDetailActivity.java b/example/src/main/java/com/mobilejazz/coltrane/example/FileDetailActivity.java
new file mode 100644
index 0000000..4cc27dd
--- /dev/null
+++ b/example/src/main/java/com/mobilejazz/coltrane/example/FileDetailActivity.java
@@ -0,0 +1,77 @@
+package com.mobilejazz.coltrane.example;
+
+import android.app.Activity;
+import android.content.res.AssetFileDescriptor;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Point;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.support.v7.app.ActionBarActivity;
+import android.os.Bundle;
+import android.view.Display;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.ImageView;
+import android.widget.Toast;
+
+import com.mobilejazz.coltrane.library.DocumentsProvider;
+import com.mobilejazz.coltrane.library.DocumentsProviderRegistry;
+import com.mobilejazz.coltrane.library.UserRecoverableException;
+import com.mobilejazz.coltrane.ui.DocumentBrowserActivity;
+import com.squareup.picasso.Picasso;
+
+import java.io.FileNotFoundException;
+
+
+public class FileDetailActivity extends Activity {
+
+    private DocumentsProvider mProvider;
+    private String mDocumentId;
+
+    private ImageView mImageView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.file_detail);
+
+        // get the documents thumbnail:
+
+        mProvider = DocumentsProviderRegistry.get().getProvider(getIntent().getStringExtra(DocumentBrowserActivity.EXTRA_PROVIDER));
+        mDocumentId = getIntent().getStringExtra(DocumentBrowserActivity.EXTRA_DOCUMENT_ID);
+
+        mImageView = (ImageView)findViewById(R.id.thumbnail);
+
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+
+            new AsyncTask<Void, Void, Uri>() {
+
+                @Override
+                protected Uri doInBackground(Void... params) {
+                    try {
+                        Display display = getWindowManager().getDefaultDisplay();
+                        Point size = new Point();
+                        display.getSize(size);
+                        return mProvider.getDocumentThumbnailUri(mDocumentId, size, null);
+                    } catch (FileNotFoundException e) {
+                        e.printStackTrace();
+                    } catch (UserRecoverableException e) {
+                        e.printStackTrace();
+                    }
+                    return null;
+                }
+
+                @Override
+                protected void onPostExecute(Uri uri) {
+                    super.onPostExecute(uri);
+                    Toast.makeText(FileDetailActivity.this, uri.toString(), Toast.LENGTH_LONG).show();
+                    Picasso.with(FileDetailActivity.this).load(uri).into(mImageView);}
+            }.execute();
+    }
+}
diff --git a/example/src/main/res/layout/file_detail.xml b/example/src/main/res/layout/file_detail.xml
new file mode 100644
index 0000000..5adb5ea
--- /dev/null
+++ b/example/src/main/res/layout/file_detail.xml
@@ -0,0 +1,14 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    tools:context="com.mobilejazz.coltrane.example.FileDetailActivity">
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/thumbnail" />
+
+</RelativeLayout>
diff --git a/example/src/main/res/values-w820dp/dimens.xml b/example/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 0000000..63fc816
--- /dev/null
+++ b/example/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/example/src/main/res/values/dimens.xml b/example/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..47c8224
--- /dev/null
+++ b/example/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+</resources>
diff --git a/example/src/main/res/values/strings.xml b/example/src/main/res/values/strings.xml
index bdb4908..96defc3 100644
--- a/example/src/main/res/values/strings.xml
+++ b/example/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
  * Copyright (C) 2011 Paul Burke
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,12 +13,16 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- -->
+-->
 <resources>
+
     <string name="app_name" translatable="false">Coltrane Example Application</string>
     <string name="chooser_title" translatable="false">Lorem ipsum</string>
-
     <string name="custom_ui">Custom UI</string>
     <string name="saf_with_fallback">Storage Access Framework with fallback</string>
     <string name="native_ui">Native UI</string>
+    <string name="title_activity_file_detail">File Detail</string>
+    <string name="hello_world">Hello world!</string>
+    <string name="action_settings">Settings</string>
+
 </resources>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 66780df..ed8bf30 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,8 +17,8 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-VERSION_NAME=0.1.3-SNAPSHOT
-VERSION_CODE=6
+VERSION_NAME=0.1.4-SNAPSHOT
+VERSION_CODE=7
 GROUP=com.mobilejazz.coltrane
 
 POM_DESCRIPTION=A filepicker with support for GDrive and Dropbox
diff --git a/library/libs/PdfViewer.jar b/library/libs/PdfViewer.jar
new file mode 100644
index 0000000..9d28552
Binary files /dev/null and b/library/libs/PdfViewer.jar differ
diff --git a/library/src/main/java/com/mobilejazz/coltrane/library/DocumentsProvider.java b/library/src/main/java/com/mobilejazz/coltrane/library/DocumentsProvider.java
index fda7c79..6f43fc4 100644
--- a/library/src/main/java/com/mobilejazz/coltrane/library/DocumentsProvider.java
+++ b/library/src/main/java/com/mobilejazz/coltrane/library/DocumentsProvider.java
@@ -42,7 +42,7 @@ public DocumentsProvider(Context context) {
 
     public abstract Collection<? extends Root> getRoots() throws FileNotFoundException;
 
-    public AssetFileDescriptor openDocumentThumbnail(String documentId, Point sizeHint, CancellationSignal signal) throws FileNotFoundException, UserRecoverableException {
+    public Uri getDocumentThumbnailUri(String documentId, Point sizeHint, CancellationSignal signal) throws FileNotFoundException, UserRecoverableException {
         throw new UnsupportedOperationException("Document thumbnails not supported");
     }
 
diff --git a/library/src/main/java/com/mobilejazz/coltrane/library/NativeDocumentsProvider.java b/library/src/main/java/com/mobilejazz/coltrane/library/NativeDocumentsProvider.java
index 639f04b..a979b65 100644
--- a/library/src/main/java/com/mobilejazz/coltrane/library/NativeDocumentsProvider.java
+++ b/library/src/main/java/com/mobilejazz/coltrane/library/NativeDocumentsProvider.java
@@ -4,14 +4,24 @@
 import android.content.res.AssetFileDescriptor;
 import android.database.Cursor;
 import android.graphics.Point;
+import android.net.Uri;
 import android.os.CancellationSignal;
 import android.os.ParcelFileDescriptor;
 import android.provider.BaseColumns;
+import android.util.Base64;
 
 import com.mobilejazz.coltrane.library.compatibility.DocumentsContract;
 import com.mobilejazz.coltrane.library.compatibility.MatrixCursor;
+import com.mobilejazz.coltrane.library.utils.FileUtils;
 
+import java.io.File;
 import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
 import java.util.Collection;
 import java.util.List;
 
@@ -77,14 +87,37 @@ public ParcelFileDescriptor openDocument(String documentId, String mode, Cancell
     }
 
     @Override
-    public AssetFileDescriptor openDocumentThumbnail(String documentId, Point sizeHint, CancellationSignal signal) throws FileNotFoundException {
+    public AssetFileDescriptor openDocumentThumbnail(final String documentId, final Point sizeHint,
+                                                     final CancellationSignal signal) throws FileNotFoundException {
         try {
-            return getDelegate().openDocumentThumbnail(documentId, sizeHint, signal);
+            Uri thumbnailUri = getDelegate().getDocumentThumbnailUri(documentId, sizeHint, signal);
+            File file;
+            if (thumbnailUri.getScheme().equals("file")) {
+                file = new File(thumbnailUri.getPath());
+            } else {
+                URLConnection urlConnection = new URL(thumbnailUri.toString()).openConnection();
+                file = File.createTempFile(Base64.encodeToString(documentId.getBytes(), Base64.URL_SAFE) + "_" + sizeHint.x + "_" + sizeHint.y, "", getContext().getCacheDir());
+                FileOutputStream out = new FileOutputStream(file);
+                FileUtils.copyStream(urlConnection.getInputStream(), out);
+                out.close();
+            }
+
+            return new AssetFileDescriptor(
+                    ParcelFileDescriptor.open(
+                                file,
+                                ParcelFileDescriptor.MODE_READ_ONLY
+                            ), 0,
+                            AssetFileDescriptor.UNKNOWN_LENGTH);
         } catch (UserRecoverableException e) {
-            throw new FileNotFoundException(e.getLocalizedMessage()); // TODO
+            throw new FileNotFoundException(e.getLocalizedMessage());
+        } catch (MalformedURLException e) {
+            throw new FileNotFoundException(e.getLocalizedMessage());
+        } catch (IOException e) {
+            throw new FileNotFoundException(e.getLocalizedMessage());
         }
     }
 
+
     @Override
     public Cursor queryRecentDocuments(String rootId, String[] projection) throws FileNotFoundException {
         try {
diff --git a/library/src/main/java/com/mobilejazz/coltrane/library/utils/FileUtils.java b/library/src/main/java/com/mobilejazz/coltrane/library/utils/FileUtils.java
index e987643..6453b83 100644
--- a/library/src/main/java/com/mobilejazz/coltrane/library/utils/FileUtils.java
+++ b/library/src/main/java/com/mobilejazz/coltrane/library/utils/FileUtils.java
@@ -35,6 +35,9 @@
 
 import java.io.File;
 import java.io.FileFilter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.text.DecimalFormat;
 import java.util.Comparator;
 
@@ -377,4 +380,15 @@ public static Intent createGetContentIntent() {
         intent.addCategory(Intent.CATEGORY_OPENABLE);
         return intent;
     }
+
+    public static void copyStream(InputStream input, OutputStream output) throws IOException
+    {
+        byte[] buffer = new byte[1024]; // Adjust if you want
+        int bytesRead;
+        while ((bytesRead = input.read(buffer)) != -1)
+        {
+            output.write(buffer, 0, bytesRead);
+        }
+    }
+
 }
diff --git a/library/src/main/java/com/mobilejazz/coltrane/library/utils/thumbnail/Thumbnail.java b/library/src/main/java/com/mobilejazz/coltrane/library/utils/thumbnail/Thumbnail.java
new file mode 100644
index 0000000..d317a35
--- /dev/null
+++ b/library/src/main/java/com/mobilejazz/coltrane/library/utils/thumbnail/Thumbnail.java
@@ -0,0 +1,87 @@
+package com.mobilejazz.coltrane.library.utils.thumbnail;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Point;
+
+import com.sun.pdfview.PDFFile;
+import com.sun.pdfview.PDFPage;
+
+import net.sf.andpdf.nio.ByteBuffer;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+
+public class Thumbnail {
+
+    public static Bitmap fromImage(final String path, final Point sizeHint) {
+        // Assume documentId points to an image file. Build a thumbnail no
+        // larger than twice the sizeHint
+        BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inJustDecodeBounds = true;
+        BitmapFactory.decodeFile(path, options);
+        final int targetHeight = 2 * sizeHint.y;
+        final int targetWidth = 2 * sizeHint.x;
+        final int height = options.outHeight;
+        final int width = options.outWidth;
+        options.inSampleSize = 1;
+        if (height > targetHeight || width > targetWidth) {
+            final int halfHeight = height / 2;
+            final int halfWidth = width / 2;
+            // Calculate the largest inSampleSize value that is a power of 2 and
+            // keeps both
+            // height and width larger than the requested height and width.
+            while ((halfHeight / options.inSampleSize) > targetHeight
+                    || (halfWidth / options.inSampleSize) > targetWidth) {
+                options.inSampleSize *= 2;
+            }
+        }
+        options.inJustDecodeBounds = false;
+        return BitmapFactory.decodeFile(path, options);
+    }
+
+    public static Bitmap fromPDF(final String path, final Point sizeHint) {
+        FileInputStream is = null;
+        try {
+
+            File file = new File(path);
+            is = new FileInputStream(file);
+
+            // Get the size of the file
+            long length = file.length();
+            byte[] bytes = new byte[(int) length];
+            int offset = 0;
+            int numRead = 0;
+            while (offset < bytes.length && (numRead=is.read(bytes, offset, bytes.length-offset)) >= 0) {
+                offset += numRead;
+            }
+            ByteBuffer buffer = ByteBuffer.wrap(bytes);
+            PDFFile pdfFile = new PDFFile(buffer);
+            PDFPage page = pdfFile.getPage(1, true);
+            return page.getImage(sizeHint.x, sizeHint.y, null, true, true);
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                is.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+
+        return null;
+    }
+
+    public static Bitmap fromFile(final String path, final Point sizeHint, final String mimeType) {
+        if ("application/pdf".equals(mimeType)) {
+            return fromPDF(path, sizeHint);
+        } else if (mimeType.startsWith("image")) {
+            return fromImage(path, sizeHint);
+        } else {
+            throw new IllegalArgumentException("Can only create a thumbnail from images and pdf.");
+        }
+    }
+
+}
diff --git a/providers/filesystem/src/main/java/com/mobilejazz/coltrane/provider/filesystem/FileSystemProvider.java b/providers/filesystem/src/main/java/com/mobilejazz/coltrane/provider/filesystem/FileSystemProvider.java
index f11d052..92fdb53 100644
--- a/providers/filesystem/src/main/java/com/mobilejazz/coltrane/provider/filesystem/FileSystemProvider.java
+++ b/providers/filesystem/src/main/java/com/mobilejazz/coltrane/provider/filesystem/FileSystemProvider.java
@@ -4,20 +4,22 @@
 import android.content.res.AssetFileDescriptor;
 import android.database.Cursor;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Point;
 import android.net.Uri;
 import android.os.CancellationSignal;
 import android.os.Environment;
 import android.os.ParcelFileDescriptor;
 import android.provider.BaseColumns;
+import android.util.Base64;
 import android.webkit.MimeTypeMap;
 
 import com.mobilejazz.coltrane.library.DocumentsProvider;
 import com.mobilejazz.coltrane.library.DocumentsProviderRegistry;
 import com.mobilejazz.coltrane.library.Root;
+import com.mobilejazz.coltrane.library.UserRecoverableException;
 import com.mobilejazz.coltrane.library.compatibility.DocumentsContract;
 import com.mobilejazz.coltrane.library.compatibility.MatrixCursor;
+import com.mobilejazz.coltrane.library.utils.thumbnail.Thumbnail;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -54,15 +56,23 @@ public List<Root> getRoots() throws FileNotFoundException {
         // Add Home directory
         File homeDir = Environment.getExternalStorageDirectory();
 
-        Root root = new Root(this,
-                homeDir.getAbsolutePath(),
-                homeDir.getAbsolutePath(),
-                getContext().getString(R.string.internal_storage),
-                R.drawable.ic_provider,
-                homeDir.getFreeSpace(),
-                DocumentsContract.Root.FLAG_LOCAL_ONLY | DocumentsContract.Root.FLAG_SUPPORTS_CREATE);
+        String state = Environment.getExternalStorageState();
 
-        return Collections.singletonList(root);
+        if (Environment.MEDIA_MOUNTED.equals(state)) {
+
+            Root root = new Root(this,
+                    homeDir.getAbsolutePath(),
+                    homeDir.getAbsolutePath(),
+                    getContext().getString(R.string.internal_storage),
+                    R.drawable.ic_provider,
+                    homeDir.getFreeSpace(),
+                    DocumentsContract.Root.FLAG_LOCAL_ONLY | DocumentsContract.Root.FLAG_SUPPORTS_CREATE);
+
+            return Collections.singletonList(root);
+
+        } else {
+            return Collections.emptyList();
+        }
     }
 
     @Override
@@ -102,39 +112,20 @@ public ParcelFileDescriptor openDocument(String documentId, String mode, Cancell
         }
     }
 
-    @Override
-    public AssetFileDescriptor openDocumentThumbnail(final String documentId, final Point sizeHint,
-                                                     final CancellationSignal signal) throws FileNotFoundException {
-        // Assume documentId points to an image file. Build a thumbnail no
-        // larger than twice the sizeHint
-        BitmapFactory.Options options = new BitmapFactory.Options();
-        options.inJustDecodeBounds = true;
-        BitmapFactory.decodeFile(documentId, options);
-        final int targetHeight = 2 * sizeHint.y;
-        final int targetWidth = 2 * sizeHint.x;
-        final int height = options.outHeight;
-        final int width = options.outWidth;
-        options.inSampleSize = 1;
-        if (height > targetHeight || width > targetWidth) {
-            final int halfHeight = height / 2;
-            final int halfWidth = width / 2;
-            // Calculate the largest inSampleSize value that is a power of 2 and
-            // keeps both
-            // height and width larger than the requested height and width.
-            while ((halfHeight / options.inSampleSize) > targetHeight
-                    || (halfWidth / options.inSampleSize) > targetWidth) {
-                options.inSampleSize *= 2;
-            }
-        }
-        options.inJustDecodeBounds = false;
-        Bitmap bitmap = BitmapFactory.decodeFile(documentId, options);
-        // Write out the thumbnail to a temporary file
-        File tempFile = null;
+    protected String getDocumentThumbnailId(final String documentId, final Point sizeHint) {
+        return Base64.encodeToString(documentId.getBytes(), Base64.URL_SAFE) + "_" + sizeHint.x + "_" + sizeHint.y;
+    }
+
+    protected File getDocumentThumbnailFile(final String documentId, final Point sizeHint) throws FileNotFoundException {
         FileOutputStream out = null;
         try {
-            tempFile = File.createTempFile("thumbnail", null, getContext().getCacheDir());
-            out = new FileOutputStream(tempFile);
+            File cacheDir = getContext().getCacheDir();
+            File thumbnail = File.createTempFile(getDocumentThumbnailId(documentId, sizeHint), "", cacheDir);
+            String mimeType = getDocumentType(documentId);
+            Bitmap bitmap = Thumbnail.fromFile(documentId, sizeHint, mimeType);
+            out = new FileOutputStream(thumbnail);
             bitmap.compress(Bitmap.CompressFormat.PNG, 90, out);
+            return thumbnail;
         } catch (IOException e) {
             Timber.e("Error writing thumbnail", e);
             return null;
@@ -146,13 +137,11 @@ public AssetFileDescriptor openDocumentThumbnail(final String documentId, final
                     Timber.e("Error closing thumbnail", e);
                 }
         }
-        // It appears the Storage Framework UI caches these results quite
-        // aggressively so there is little reason to
-        // write your own caching layer beyond what you need to return a single
-        // AssetFileDescriptor
-        return new AssetFileDescriptor(ParcelFileDescriptor.open(tempFile,
-                ParcelFileDescriptor.MODE_READ_ONLY), 0,
-                AssetFileDescriptor.UNKNOWN_LENGTH);
+    }
+
+    @Override
+    public Uri getDocumentThumbnailUri(String documentId, Point sizeHint, CancellationSignal signal) throws FileNotFoundException, UserRecoverableException {
+        return Uri.fromFile(getDocumentThumbnailFile(documentId, sizeHint));
     }
 
     public String getDocumentType(final String documentId) throws FileNotFoundException {
diff --git a/providers/gdrive/src/main/java/com/mobilejazz/coltrane/provider/gdrive/GoogleDriveProvider.java b/providers/gdrive/src/main/java/com/mobilejazz/coltrane/provider/gdrive/GoogleDriveProvider.java
index f3e2d11..1f2f8f2 100644
--- a/providers/gdrive/src/main/java/com/mobilejazz/coltrane/provider/gdrive/GoogleDriveProvider.java
+++ b/providers/gdrive/src/main/java/com/mobilejazz/coltrane/provider/gdrive/GoogleDriveProvider.java
@@ -1,10 +1,9 @@
 package com.mobilejazz.coltrane.provider.gdrive;
 
 import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.app.PendingIntent;
 import android.content.Context;
 import android.database.Cursor;
+import android.graphics.Point;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.CancellationSignal;
@@ -150,7 +149,7 @@ public Collection<? extends Root> getRoots() throws FileNotFoundException {
             mRoots = new TreeMap<String, GDriveRoot>();
 
             GoogleAccountCredential credential = GoogleAccountCredential.usingOAuth2(getContext(), Collections.singleton(DriveScopes.DRIVE));
-            Account[] accounts = credential.getAllAccounts(); //AccountManager.get(getContext()).getAccountsByType("com.google");
+            Account[] accounts = credential.getAllAccounts();
             for (Account a : accounts) {
                 credential = GoogleAccountCredential.usingOAuth2(getContext(), Collections.singleton(DriveScopes.DRIVE));
                 credential.setSelectedAccountName(a.name);
@@ -203,6 +202,20 @@ public ParcelFileDescriptor openDocument(String documentId, String mode, Cancell
         }
     }
 
+    @Override
+    public Uri getDocumentThumbnailUri(String documentId, Point sizeHint, CancellationSignal signal) throws FileNotFoundException, UserRecoverableException {
+        try {
+            Document d = new Document(mRoots, documentId);
+            File file = d.getRoot().getDrive().files().get(d.getDriveId()).execute();
+            String thumbnailLink = file.getThumbnailLink();
+            return Uri.parse(thumbnailLink.substring(0, thumbnailLink.length() - 4) + "s" + Math.max(sizeHint.x, sizeHint.y));
+        } catch (UserRecoverableAuthIOException e) {
+            throw new UserRecoverableException(e.getLocalizedMessage(), e, e.getIntent());
+        }  catch (IOException e) {
+            throw new FileNotFoundException(e.getLocalizedMessage());
+        }
+    }
+
     @Override
     public String getId() {
         return ID;