diff --git a/src/calibre/devices/android/driver.py b/src/calibre/devices/android/driver.py
index cd43e2f38a..beed7c679d 100644
--- a/src/calibre/devices/android/driver.py
+++ b/src/calibre/devices/android/driver.py
@@ -18,7 +18,8 @@ class ANDROID(USBMS):
     FORMATS     = ['epub', 'pdf']
 
     VENDOR_ID   = {
-            0x0bb4 : { 0x0c02 : [0x100], 0x0c01 : [0x100]},
+            # HTC
+            0x0bb4 : { 0x0c02 : [0x100], 0x0c01 : [0x100], 0x0ff9 : [0x0100]},
 
             # Motorola
             0x22b8 : { 0x41d9 : [0x216], 0x2d67 : [0x100], 0x41db : [0x216]},
diff --git a/src/calibre/ebooks/oeb/base.py b/src/calibre/ebooks/oeb/base.py
index 2aabbf2e95..79f9f15248 100644
--- a/src/calibre/ebooks/oeb/base.py
+++ b/src/calibre/ebooks/oeb/base.py
@@ -1190,7 +1190,8 @@ class Manifest(object):
         if item in self.ids:
             item = self.ids[item]
         del self.ids[item.id]
-        del self.hrefs[item.href]
+        if item.href in self.hrefs:
+            del self.hrefs[item.href]
         self.items.remove(item)
         if item in self.oeb.spine:
             self.oeb.spine.remove(item)
diff --git a/src/calibre/gui2/dialogs/metadata_single.py b/src/calibre/gui2/dialogs/metadata_single.py
index 570143f520..3df197e6a5 100644
--- a/src/calibre/gui2/dialogs/metadata_single.py
+++ b/src/calibre/gui2/dialogs/metadata_single.py
@@ -180,27 +180,34 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
             self.formats_changed = True
 
     def get_selected_format_metadata(self):
-        row = self.formats.currentRow()
-        fmt = self.formats.item(row)
-        if fmt is None:
-            if self.formats.count() == 1:
-                fmt = self.formats.item(0)
-            if fmt is None:
-                error_dialog(self, _('No format selected'),
-                    _('No format selected')).exec_()
-                return None, None
-        ext = fmt.ext.lower()
-        if fmt.path is None:
-            stream = self.db.format(self.row, ext, as_file=True)
-        else:
-            stream = open(fmt.path, 'r+b')
+        old = prefs['read_file_metadata']
+        if not old:
+            prefs['read_file_metadata'] = True
         try:
-            mi = get_metadata(stream, ext)
-            return mi, ext
-        except:
-            error_dialog(self, _('Could not read metadata'),
-                         _('Could not read metadata from %s format')%ext).exec_()
-        return None, None
+            row = self.formats.currentRow()
+            fmt = self.formats.item(row)
+            if fmt is None:
+                if self.formats.count() == 1:
+                    fmt = self.formats.item(0)
+                if fmt is None:
+                    error_dialog(self, _('No format selected'),
+                        _('No format selected')).exec_()
+                    return None, None
+            ext = fmt.ext.lower()
+            if fmt.path is None:
+                stream = self.db.format(self.row, ext, as_file=True)
+            else:
+                stream = open(fmt.path, 'r+b')
+            try:
+                mi = get_metadata(stream, ext)
+                return mi, ext
+            except:
+                error_dialog(self, _('Could not read metadata'),
+                            _('Could not read metadata from %s format')%ext).exec_()
+            return None, None
+        finally:
+            if old != prefs['read_file_metadata']:
+                prefs['read_file_metadata'] = old
 
     def set_metadata_from_format(self):
         mi, ext = self.get_selected_format_metadata()