diff --git a/mod/editpost.php b/mod/editpost.php
index 61dfcf911d..d4f5567eeb 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -21,7 +21,7 @@ function editpost_content(App $a)
 	}
 
 	$post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
-	$return_url = (($a->argc > 1) ? base64_decode($a->argv[2]) : '');
+	$return_url = (($a->argc > 2) ? base64_decode($a->argv[2]) : '');
 
 	if (!$post_id) {
 		notice(L10n::t('Item not found') . EOL);
diff --git a/mod/message.php b/mod/message.php
index 9ac0ddbc0b..7377ba5e48 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -92,7 +92,7 @@ function message_post(App $a)
 		$a->argc = 2;
 		$a->argv[1] = 'new';
 	} else {
-		goaway(System::baseUrl() . '/' . $a->cmd . '/' . $ret);
+		goaway($a->cmd . '/' . $ret);
 	}
 }