diff --git a/resources/images/devices/itunes.png b/resources/images/devices/itunes.png
index cd8579d492..cc0493d9eb 100644
Binary files a/resources/images/devices/itunes.png and b/resources/images/devices/itunes.png differ
diff --git a/src/calibre/devices/apple/driver.py b/src/calibre/devices/apple/driver.py
index e1133ab929..dea5844028 100644
--- a/src/calibre/devices/apple/driver.py
+++ b/src/calibre/devices/apple/driver.py
@@ -135,7 +135,8 @@ class ITUNES(DriverBase):
     '''
     Calling sequences:
     Initialization:
-        can_handle() or can_handle_windows()
+        can_handle() | can_handle_windows()
+         _launch_iTunes()
         reset()
         open()
         card_prefix()
diff --git a/src/calibre/library/catalog.py b/src/calibre/library/catalog.py
index a19534191b..97454c90e2 100644
--- a/src/calibre/library/catalog.py
+++ b/src/calibre/library/catalog.py
@@ -149,6 +149,15 @@ class CSV_XML(CatalogPlugin): # {{{
                     elif field == 'comments':
                         item = item.replace(u'\r\n',u' ')
                         item = item.replace(u'\n',u' ')
+
+                    # Convert HTML to markdown text
+                    if type(item) is unicode:
+                        opening_tag = re.search('<(\w+)(\x20|>)',item)
+                        if opening_tag:
+                            closing_tag = re.search('<\/%s>$' % opening_tag.group(1), item)
+                            if closing_tag:
+                                item = html2text(item)
+
                     outstr.append(u'"%s"' % unicode(item).replace('"','""'))
 
                 outfile.write(u','.join(outstr) + u'\n')