diff --git a/adminer/include/design.inc.php b/adminer/include/design.inc.php
index 9b7c751d..48b88bb0 100644
--- a/adminer/include/design.inc.php
+++ b/adminer/include/design.inc.php
@@ -63,7 +63,7 @@ function page_footer($missing = false) {
 <?php switch_lang(); ?>
 <div id="menu">
 <h1><a href="http://www.adminer.org/" class="h1"><?php echo $adminer->name(); ?></a> &nbsp; <?php echo $VERSION; ?> &nbsp;
-<a href='http://www.adminer.org/#download' id="version"><?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?></a>
+<a href="http://www.adminer.org/#download" id="version"><?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?></a>
 </h1>
 <?php $adminer->navigation($missing); ?>
 </div>
diff --git a/compile.php b/compile.php
index 7a370412..318a74ce 100644
--- a/compile.php
+++ b/compile.php
@@ -109,6 +109,14 @@ function php_shrink($input) {
 			if ($token[0] == T_DOC_COMMENT) {
 				$doc_comment = true;
 			}
+			if ($token[0] == T_CLOSE_TAG && $tokens[$i+1][0] == T_INLINE_HTML && $tokens[$i+2][0] == T_OPEN_TAG
+			&& strlen(addcslashes($tokens[$i+1][1], "'\\")) < strlen($tokens[$i+1][1]) + 4
+			) {
+				$tokens[$i] = array(T_ECHO, 'echo');
+				$tokens[$i+1] = array(T_CONSTANT_ENCAPSED_STRING, "'" . addcslashes($tokens[$i+1][1], "'\\") . "'");
+				$tokens[$i+2] = array(0, ';');
+				$token = $tokens[$i];
+			}
 			if ($token[0] == T_VAR) {
 				$shortening = false;
 			} elseif (!$shortening) {
@@ -120,8 +128,11 @@ function php_shrink($input) {
 			} elseif ($token[1] == ';' && $in_echo) {
 				$in_echo = false;
 				if ($tokens[$i+1][0] === T_WHITESPACE && $tokens[$i+2][0] === T_ECHO) {
-					// join two consecutive echos
 					next($tokens);
+					$i++;
+				}
+				if ($tokens[$i+1][0] === T_ECHO) {
+					// join two consecutive echos
 					next($tokens);
 					$token[1] = '.'; //! join ''.'' and "".""
 				}