diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 457f905b..fe55b513 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -1283,7 +1283,7 @@ function mod_edit_post($board, $edit_raw_html, $postID) {
 		$query->bindValue(':subject', $_POST['subject']);
 		$query->bindValue(':body', $_POST['body']);
 		if ($edit_raw_html) {
-			$body_nomarkup = $_POST['body'] . '<tinyboard raw html>1</tinyboard>';
+			$body_nomarkup = $_POST['body'] . "\n<tinyboard raw html>1</tinyboard>";
 			$query->bindValue(':body_nomarkup', $body_nomarkup);
 		}
 		$query->execute() or error(db_error($query));
diff --git a/post.php b/post.php
index 92035f77..49f569f4 100644
--- a/post.php
+++ b/post.php
@@ -422,7 +422,7 @@ if (isset($_POST['delete'])) {
 	$post['body'] = escape_markup_modifiers($post['body']);
 	
 	if ($mod && isset($post['raw']) && $post['raw']) {
-		$post['body'] .= '<tinyboard raw html>1</tinyboard>';
+		$post['body'] .= "\n<tinyboard raw html>1</tinyboard>";
 	}
 	
 	if ($config['country_flags']) {
@@ -430,7 +430,8 @@ if (isset($_POST['delete'])) {
 			error('GeoIP not available: ' . geoip_db_filename(GEOIP_COUNTRY_EDITION));
 		}
 		if ($country_code = @geoip_country_code_by_name($_SERVER['REMOTE_ADDR'])) {
-			$post['body'] .= '<tinyboard flag>' . strtolower($country_code) . '</tinyboard>';
+			$post['body'] .= "\n<tinyboard flag>" . strtolower($country_code) . "</tinyboard>" .
+				"\n<tinyboard flag alt>" . @geoip_country_name_by_name($_SERVER['REMOTE_ADDR']) . "</tinyboard>";
 		}
 	}