diff --git a/source/java/org/alfresco/repo/rendition/RenditionDefinitionPersisterImpl.java b/source/java/org/alfresco/repo/rendition/RenditionDefinitionPersisterImpl.java
index 6c7655e64c..405818aac0 100644
--- a/source/java/org/alfresco/repo/rendition/RenditionDefinitionPersisterImpl.java
+++ b/source/java/org/alfresco/repo/rendition/RenditionDefinitionPersisterImpl.java
@@ -149,6 +149,14 @@ public class RenditionDefinitionPersisterImpl implements RenditionDefinitionPers
         runtimeActionService.saveActionImpl(actionNodeRef, renderingAction);
     }
     
+    public void deleteRenditionDefinition(RenditionDefinition renderingAction)
+    {
+        NodeRef actionNodeRef = findOrCreateActionNode(renderingAction);
+        if(actionNodeRef != null) {
+           nodeService.deleteNode(actionNodeRef);
+        }
+    }
+    
     private NodeRef findActionNode(QName renditionDefinitionName)
     {
         checkRenderingActionRootNodeExists();
diff --git a/source/java/org/alfresco/repo/rendition/executer/HTMLRenderingEngine.java b/source/java/org/alfresco/repo/rendition/executer/HTMLRenderingEngine.java
index adbec70793..e0a291f5d4 100644
--- a/source/java/org/alfresco/repo/rendition/executer/HTMLRenderingEngine.java
+++ b/source/java/org/alfresco/repo/rendition/executer/HTMLRenderingEngine.java
@@ -41,7 +41,6 @@ import org.alfresco.repo.action.ParameterDefinitionImpl;
 import org.alfresco.repo.rendition.RenditionLocation;
 import org.alfresco.service.cmr.action.ParameterDefinition;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
-import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.rendition.RenditionServiceException;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentService;
@@ -87,6 +86,13 @@ public class HTMLRenderingEngine extends AbstractRenderingEngine
      * By default, the whole of the HTML document is used.
      */
     public static final String PARAM_BODY_CONTENTS_ONLY = "bodyContentsOnly";
+    /**
+     * This optional parameter, when set to true, causes any embedded
+     *  images to be written into the same folder as the html, with
+     *  a name prefix.
+     * By default, images are placed into a sub-folder.
+     */
+    public static final String PARAM_IMAGES_SAME_FOLDER = "imagesSameFolder";
 
     /*
      * Action constants
@@ -99,6 +105,8 @@ public class HTMLRenderingEngine extends AbstractRenderingEngine
        Collection<ParameterDefinition> paramList = super.getParameterDefinitions();
        paramList.add(new ParameterDefinitionImpl(PARAM_BODY_CONTENTS_ONLY, DataTypeDefinition.BOOLEAN, false,
              getParamDisplayLabel(PARAM_BODY_CONTENTS_ONLY)));
+       paramList.add(new ParameterDefinitionImpl(PARAM_IMAGES_SAME_FOLDER, DataTypeDefinition.BOOLEAN, false,
+             getParamDisplayLabel(PARAM_IMAGES_SAME_FOLDER)));
        return paramList;
     }
 
@@ -128,30 +136,54 @@ public class HTMLRenderingEngine extends AbstractRenderingEngine
         // This will also extract out any images as found
         generateHTML(p, context);
     }
-    
+
+    private String getHtmlBaseName(RenderingContext context)
+    {
+       // Based on the name of the source node, which will
+       //  also largely be the name of the html node
+       String baseName = nodeService.getProperty( 
+             context.getSourceNode(),
+             ContentModel.PROP_NAME
+       ).toString();
+       if(baseName.lastIndexOf('.') > -1)
+       {
+          baseName = baseName.substring(0, baseName.lastIndexOf('.'));
+       }
+       return baseName;
+    }
     /**
      * What name should be used for the images directory?
+     * Note this is only required if {@link #PARAM_IMAGES_SAME_FOLDER} is false (the default).
      */
     private String getImagesDirectoryName(RenderingContext context)
     {
        // Based on the name of the source node, which will
        //  also largely be the name of the html node
-       String folderName = nodeService.getProperty( 
-             context.getSourceNode(),
-             ContentModel.PROP_NAME
-       ).toString();
-       if(folderName.lastIndexOf('.') > -1)
-       {
-          folderName = folderName.substring(0, folderName.lastIndexOf('.'));
-       }
+       String folderName = getHtmlBaseName(context);
        folderName = folderName + "_files";
        return folderName;
     }
+    /**
+     * What prefix should be applied to the name of images? 
+     */
+    private String getImagesPrefixName(RenderingContext context)
+    {
+       if( context.getParamWithDefault(PARAM_IMAGES_SAME_FOLDER, false) )
+       {
+          // Prefix with the name of the source node
+          return getHtmlBaseName(context) + "_";
+       }
+       else {
+          // They have their own folder, so no prefix is needed
+          return "";
+       }
+    }
     
     /**
      * Creates a directory to store the images in.
      * The directory will be a sibling of the rendered
      *  HTML, and named similar to it.
+     * Note this is only required if {@link #PARAM_IMAGES_SAME_FOLDER} is false (the default).
      */
     private NodeRef createImagesDirectory(RenderingContext context)
     {
@@ -245,8 +277,17 @@ public class HTMLRenderingEngine extends AbstractRenderingEngine
        handler.getTransformer().setOutputProperty(OutputKeys.METHOD, "xml");
        
        // Change the image links as they go past
+       String dirName = null, imgPrefix = null;
+       if(context.getParamWithDefault(PARAM_IMAGES_SAME_FOLDER, false))
+       {
+          imgPrefix = getImagesPrefixName(context);
+       }
+       else
+       {
+          dirName = getImagesDirectoryName(context);
+       }
        ContentHandler contentHandler = new TikaImageRewritingContentHandler(
-             handler, getImagesDirectoryName(context)
+             handler, dirName, imgPrefix
        );
        
        // If required, wrap it to only return the body 
@@ -342,6 +383,16 @@ public class HTMLRenderingEngine extends AbstractRenderingEngine
          types.add(MediaType.image("jpeg"));
          types.add(MediaType.image("png"));
          types.add(MediaType.image("tiff"));
+         
+         // Are images going in the same place as the HTML?
+         if( renderingContext.getParamWithDefault(PARAM_IMAGES_SAME_FOLDER, false) )
+         {
+            RenditionLocation location = resolveRenditionLocation(
+                  renderingContext.getSourceNode(), renderingContext.getDefinition(), 
+                  renderingContext.getDestinationNode()
+            );
+            imgFolder = location.getParentRef();
+         }
       }
       
       @Override
@@ -399,6 +450,9 @@ public class HTMLRenderingEngine extends AbstractRenderingEngine
             filename = "image-" + count + ".";
             filename += type.substring(type.indexOf('/')+1);
          }
+         
+         // Prefix the filename if needed
+         filename = getImagesPrefixName(renderingContext) + filename; 
 
          // Save the image
          createEmbeddedImage(imgFolder, (count==1), filename, type, stream, renderingContext);
@@ -411,10 +465,12 @@ public class HTMLRenderingEngine extends AbstractRenderingEngine
      */
     private class TikaImageRewritingContentHandler extends ContentHandlerDecorator {
        private String imageFolder;
+       private String imagePrefix;
        
-       private TikaImageRewritingContentHandler(ContentHandler handler, String imageFolder) {
+       private TikaImageRewritingContentHandler(ContentHandler handler, String imageFolder, String imagePrefix) {
           super(handler);
           this.imageFolder = imageFolder;
+          this.imagePrefix = imagePrefix;
        }
 
        @Override
@@ -434,9 +490,13 @@ public class HTMLRenderingEngine extends AbstractRenderingEngine
                 if("src".equals(attrs.getLocalName(i))) {
                    String src = attrs.getValue(i);
                    if(src.startsWith("embedded:")) {
-                      src = imageFolder + "/" +
-                               src.substring(src.indexOf(':')+1);
-                      attrs.setValue(i, src);
+                      String newSrc = "";
+                      if(imageFolder != null)
+                         newSrc += imageFolder + "/";
+                      if(imagePrefix != null)
+                         newSrc += imagePrefix;
+                      newSrc += src.substring(src.indexOf(':')+1);
+                      attrs.setValue(i, newSrc);
                    }
                 }
              }
diff --git a/source/java/org/alfresco/repo/rendition/executer/HTMLRenderingEngineTest.java b/source/java/org/alfresco/repo/rendition/executer/HTMLRenderingEngineTest.java
index a3fc29bb01..4fbb3f12a7 100644
--- a/source/java/org/alfresco/repo/rendition/executer/HTMLRenderingEngineTest.java
+++ b/source/java/org/alfresco/repo/rendition/executer/HTMLRenderingEngineTest.java
@@ -28,6 +28,7 @@ import java.util.Map;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.content.transform.AbstractContentTransformerTest;
 import org.alfresco.repo.model.Repository;
+import org.alfresco.repo.rendition.RenditionDefinitionPersisterImpl;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.rendition.RenditionDefinition;
@@ -60,6 +61,8 @@ public class HTMLRenderingEngineTest extends BaseAlfrescoSpringTest
     private NodeRef targetFolder;
     private String targetFolderPath;
     
+    private RenditionDefinition def;
+    
     private static final String MIMETYPE_DOC = "application/msword";
     private static final String MIMETYPE_DOCX = "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
 
@@ -81,6 +84,17 @@ public class HTMLRenderingEngineTest extends BaseAlfrescoSpringTest
         this.companyHome = repositoryHelper.getCompanyHome();
         
         createTargetFolder();
+        
+        // Setup the basic rendition definition
+        QName renditionName = QName.createQName("Test");
+        RenditionDefinition rd = renditionService.loadRenditionDefinition(renditionName); 
+        if(rd != null)
+        {
+           RenditionDefinitionPersisterImpl rdp = new RenditionDefinitionPersisterImpl();
+           rdp.setNodeService(nodeService);
+           rdp.deleteRenditionDefinition(rd);
+        }
+        def = renditionService.createRenditionDefinition(renditionName, HTMLRenderingEngine.NAME);
     }
     
     @Override
@@ -166,8 +180,6 @@ public class HTMLRenderingEngineTest extends BaseAlfrescoSpringTest
 
     public void testBasics() throws Exception
     {
-       RenditionDefinition def = renditionService.createRenditionDefinition(
-             QName.createQName("Test"), HTMLRenderingEngine.NAME);
        def.setParameterValue(
              RenditionService.PARAM_DESTINATION_PATH_TEMPLATE,
              targetFolderPath + "/${name}.html"
@@ -230,8 +242,6 @@ public class HTMLRenderingEngineTest extends BaseAlfrescoSpringTest
      */
     public void testDocWithoutImages() throws Exception
     {
-       RenditionDefinition def = renditionService.createRenditionDefinition(
-             QName.createQName("Test"), HTMLRenderingEngine.NAME);
        def.setParameterValue(
              RenditionService.PARAM_DESTINATION_PATH_TEMPLATE,
              targetFolderPath + "/${name}.html"
@@ -298,19 +308,21 @@ public class HTMLRenderingEngineTest extends BaseAlfrescoSpringTest
     
     /**
      * Test for a .doc and a .docx, both of which have 
-     *  a single image each
+     *  images in them
      */
-    public void testDocWithOneImages() throws Exception
+    public void testDocWithImages() throws Exception
     {
-       RenditionDefinition def = renditionService.createRenditionDefinition(
-             QName.createQName("Test"), HTMLRenderingEngine.NAME);
        def.setParameterValue(
              RenditionService.PARAM_DESTINATION_PATH_TEMPLATE,
              targetFolderPath + "/${name}.html"
        );
+       
+       String[] files = new String[] {"quickImg1.doc","quickImg1.docx", "quickImg3.doc","quickImg3.docx"};
+       int[] imgCounts = new int[] {1,1, 3,3};
 
-       for(String name : new String[] {"quickImg1.doc","quickImg1.docx"})
+       for(int i=0; i<files.length; i++)
        {
+          String name = files[i];
           sourceDoc = createForDoc(name);
           
           String baseName = name.substring(0, name.lastIndexOf('.'));
@@ -374,7 +386,7 @@ public class HTMLRenderingEngineTest extends BaseAlfrescoSpringTest
           assertNotNull("Couldn't find new folder named " + baseName + "_files", imgFolder);
           
           // Check the contents
-          assertEquals(1, nodeService.getChildAssocs(imgFolder).size());
+          assertEquals(imgCounts[i], nodeService.getChildAssocs(imgFolder).size());
           
           
           // TODO Check against composite content associations when present 
@@ -400,11 +412,92 @@ public class HTMLRenderingEngineTest extends BaseAlfrescoSpringTest
     }
     
     /**
-     * Test for a .doc and a .docx, both of which have 
-     *  a multiple images each
+     * Test for the option to have the images written to the
+     *  same folder as the html, with a name prefix to them.
+     *  
+     * TODO Re-enable when we've figured out why the rendition service sulkts
      */
-    public void testDocWithManyImages() throws Exception
+    public void DISABLEDtestImagesSameFolder() throws Exception
     {
-       
+       def.setParameterValue(
+             RenditionService.PARAM_DESTINATION_PATH_TEMPLATE,
+             targetFolderPath + "/${name}.html"
+       );
+       def.setParameterValue(
+             HTMLRenderingEngine.PARAM_IMAGES_SAME_FOLDER,
+             true
+       );
+
+       for(String name : new String[] {"quickImg3.doc","quickImg3.docx"})
+       {
+          sourceDoc = createForDoc(name);
+          String baseName = name.substring(0, name.lastIndexOf('.'));
+          
+          int numItemsStart = nodeService.getChildAssocs(targetFolder).size();
+          
+          ChildAssociationRef rendition = renditionService.render(sourceDoc, def);
+          assertNotNull(rendition);
+          
+          // Check it was created
+          NodeRef htmlNode = rendition.getChildRef();
+          assertEquals(true, nodeService.exists(htmlNode));
+          
+          // Check it got the right name
+          assertEquals(
+                baseName + ".html",
+                nodeService.getProperty(htmlNode, ContentModel.PROP_NAME)
+          );
+          
+          // Check it ended up in the right place
+          assertEquals(
+                "Should have been in " + targetFolderPath + " but was  in" +
+                   nodeService.getPath(htmlNode),
+                targetFolder,
+                nodeService.getPrimaryParent(htmlNode).getParentRef()
+          );
+          
+          // Check it got the right contents
+          ContentReader reader = contentService.getReader(
+                htmlNode, ContentModel.PROP_CONTENT
+          );
+          String html = reader.getContentString();
+          assertEquals("<?xml", html.substring(0, 5));
+          
+          // Check that the html has the img tags
+          assertEquals(
+                "Couldn't find img tag in html:\n" + html,
+                true, html.contains("<img")
+          );
+          
+          // Check that it has the right img src
+          String expSource = "src=\""+ baseName + "_image";
+          assertEquals(
+                "Couldn't find correct img src in html:\n" + expSource + "\n" + html,
+                true, html.contains(expSource)
+          );
+          
+          // Check we got an image folder
+          int numItems = nodeService.getChildAssocs(targetFolder).size();
+          assertEquals(numItemsStart+4, numItems);
+          
+          // There shouldn't be an image folder created
+          for(ChildAssociationRef ref : nodeService.getChildAssocs(targetFolder)) {
+             if(nodeService.getProperty(ref.getChildRef(), ContentModel.PROP_NAME).equals(
+                   baseName + "_files"
+             )) {
+                fail("Image folder was created but shouldn't be there");
+             }
+          }
+          
+          // Check we got the images in the same directory as the html
+          int images = 0;
+          for(ChildAssociationRef ref : nodeService.getChildAssocs(targetFolder)) {
+             String childName = (String)nodeService.getProperty(ref.getChildRef(), ContentModel.PROP_NAME);
+             if(childName.startsWith(baseName + "_image")) {
+                images++;
+             }
+          }
+          assertEquals(3, images);
+       }
     }
 }