diff --git a/src/calibre/devices/cybookg3/driver.py b/src/calibre/devices/cybookg3/driver.py
index 8f58c65ae7..c09f795627 100644
--- a/src/calibre/devices/cybookg3/driver.py
+++ b/src/calibre/devices/cybookg3/driver.py
@@ -49,8 +49,11 @@ class CYBOOKG3(USBMS):
     def upload_cover(self, path, filename, metadata):
         coverdata = getattr(metadata, 'thumbnail', None)
         if coverdata and coverdata[2]:
-            with open('%s_6090.t2b' % os.path.join(path, filename), 'wb') as t2bfile:
-                t2b.write_t2b(t2bfile, coverdata[2])
+            coverdata = coverdata[2]
+        else:
+            coverdata = None
+        with open('%s_6090.t2b' % os.path.join(path, filename), 'wb') as t2bfile:
+            t2b.write_t2b(t2bfile, coverdata)
 
     @classmethod
     def can_handle(cls, device_info, debug=False):
diff --git a/src/calibre/ebooks/pml/pmlconverter.py b/src/calibre/ebooks/pml/pmlconverter.py
index 3484be5927..099a23c544 100644
--- a/src/calibre/ebooks/pml/pmlconverter.py
+++ b/src/calibre/ebooks/pml/pmlconverter.py
@@ -71,8 +71,8 @@ class PML_HTMLizer(object):
         'ra': ('<span id="r%s"></span><a href="#%s">', '</a>'),
         'c': ('<div style="text-align: center; margin: auto;">', '</div>'),
         'r': ('<div style="text-align: right;">', '</div>'),
-        't': ('<div style="margin-left: 5%;">', '</div>'),
-        'T': ('<div style="margin-left: %s;">', '</div>'),
+        't': ('<div style="text-indent: 1.5em;">', '</div>'),
+        'T': ('<div style="text-indent: %s;">', '</div>'),
         'i': ('<span style="font-style: italic;">', '</span>'),
         'u': ('<span style="text-decoration: underline;">', '</span>'),
         'd': ('<span style="text-decoration: line-through;">', '</span>'),
diff --git a/src/calibre/ebooks/pml/pmlml.py b/src/calibre/ebooks/pml/pmlml.py
index 77f858dbc9..2e00ad6ae3 100644
--- a/src/calibre/ebooks/pml/pmlml.py
+++ b/src/calibre/ebooks/pml/pmlml.py
@@ -204,10 +204,12 @@ class PMLMLizer(object):
         tag_count = 0
 
         # Are we in a paragraph block?
-        if tag in BLOCK_TAGS or style['display'] in BLOCK_STYLES:
+        if tag in BLOCK_TAGS:# or style['display'] in BLOCK_STYLES:
             if 'block' not in tag_stack:
                 tag_count += 1
                 tag_stack.append('block')
+                if self.opts.remove_paragraph_spacing:
+                    text.append('\\t')
 
         # Process tags that need special processing and that do not have inner
         # text. Usually these require an argument
@@ -287,10 +289,14 @@ class PMLMLizer(object):
             close_tag_list.insert(0, tag_stack.pop())
         text += self.close_tags(close_tag_list)
         if tag in SEPARATE_TAGS:
-            text.append('\n\n')
+            text.append('\n')
+            if not self.opts.remove_paragraph_spacing:
+                text.append('\n')
 
-        if 'block' not in tag_stack:
-            text.append('\n\n')
+        if 'block' not in tag_stack and text and text[-1] != '\n':
+            text.append('\n')
+            if not self.opts.remove_paragraph_spacing:
+                text.append('\n')
 
         #if style['page-break-after'] == 'always':
         #    text.append('\\p')