Index: lams_admin/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_admin/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_admin/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_central/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_central/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_central/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_gradebook/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_gradebook/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_gradebook/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_learning/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_learning/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_learning/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_monitoring/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_monitoring/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_monitoring/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_chat/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_tool_chat/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_tool_chat/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_daco/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_tool_daco/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_tool_daco/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_doku/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_tool_doku/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_tool_doku/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_doku/web/pages/learning/learning.jsp
===================================================================
diff -u -r1ad946fb218ec5d1bfe16900aa8cf2cdc1a63da7 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_tool_doku/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 1ad946fb218ec5d1bfe16900aa8cf2cdc1a63da7)
+++ lams_tool_doku/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -50,7 +50,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${hasEditRight} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_forum/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_tool_forum/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_tool_forum/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_gmap/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_tool_gmap/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_tool_gmap/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_images/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_tool_images/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_tool_images/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_imscc/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_tool_imscc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_tool_imscc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_laqa/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_tool_laqa/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_tool_laqa/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_larsrc/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_tool_larsrc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_tool_larsrc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_leader/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_tool_leader/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_tool_leader/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_mindmap/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_tool_mindmap/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_tool_mindmap/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_nb/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_tool_nb/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_tool_nb/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_notebook/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_tool_notebook/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_tool_notebook/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_pixlr/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_tool_pixlr/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_tool_pixlr/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_preview/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_tool_preview/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_tool_preview/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_sbmt/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_tool_sbmt/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_tool_sbmt/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_scribe/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_tool_scribe/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_tool_scribe/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_tool_spreadsheet/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_survey/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_tool_survey/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_tool_survey/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_task/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_tool_task/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_tool_task/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_vote/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_tool_vote/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_tool_vote/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_wiki/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_tool_wiki/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_tool_wiki/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_tool_zoom/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_tool_zoom/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_tool_zoom/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });
Index: lams_www/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r4ac624d03dd0c8c56ded54d2697e7e33cd5cc737 -r75928804902c94c4a9f0b59f39ca8594386bdfde
--- lams_www/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 4ac624d03dd0c8c56ded54d2697e7e33cd5cc737)
+++ lams_www/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 75928804902c94c4a9f0b59f39ca8594386bdfde)
@@ -56,7 +56,7 @@
 		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
 		        		iframe = $('iframe[src^="' + src + '"]'),
 		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height);
+		            	height = Math.max(200, msg.data.height - (${showControls} ? 0 : 64));
 		           	iframe.height(height);
 		        }
 		    });