Index: InputHtmlRenderer.java
===================================================================
--- InputHtmlRenderer.java	(revision 332323)
+++ InputHtmlRenderer.java	(working copy)
@@ -228,9 +228,11 @@
 					writeTag(writer, "image_xsl_uri", addResource.getResourceUri(context, InputHtmlRenderer.class, "kupudrawers/drawer.xsl"), editor);
 					writeTag(writer, "link_xsl_uri", addResource.getResourceUri(context, InputHtmlRenderer.class, "kupudrawers/drawer.xsl"), editor);
 
-					// TODO : Make this work (reference available images, ...).
-					writeTag(writer, "image_libraries_uri", addResource.getResourceUri(context, InputHtmlRenderer.class, "kupudrawers/imagelibrary.xml"), editor);
-					writeTag(writer, "link_libraries_uri", addResource.getResourceUri(context, InputHtmlRenderer.class, "kupudrawers/linklibrary.xml"), editor);
+                                        if (editor.getImageLibrary() != null){
+                                            writeTag(writer, "image_libraries_uri", addResource.getResourceUri(context, editor.getImageLibrary(), true), editor);                                        
+					}
+                                        // TODO : Make this work (reference available images, ...).
+                                        writeTag(writer, "link_libraries_uri", addResource.getResourceUri(context, InputHtmlRenderer.class, "kupudrawers/linklibrary.xml"), editor);
 	        		writeTag(writer, "search_images_uri", "", editor);
 	        		writeTag(writer, "search_links_uri", "", editor);
 
@@ -417,7 +419,7 @@
                     if( ! editor.isAllowExternalLinks() ){
                         writer.writeAttribute(HTML.STYLE_ATTR, "display: none", null);
                     }
-                		writeButton(writer, "kupu-image", "image", null, "kupu-imagelibdrawer-button", false, editor); // TODO : Enable
+                		writeButton(writer, "kupu-image", "image", null, "kupu-imagelibdrawer-button", editor.getImageLibrary() != null , editor); 
                 		writeButton(writer, "kupu-inthyperlink", "link", null, "kupu-linklibdrawer-button", false, editor); // TODO : Enable
                 		writeButton(writer, "kupu-exthyperlink", "external link", null, "kupu-linkdrawer-button", editor);
                 		writeButton(writer, "kupu-table", "table", null, "kupu-tabledrawer-button", editor);