diff --git a/aider_gitea/__main__.py b/aider_gitea/__main__.py
index 3c763f3..1c95db2 100644
--- a/aider_gitea/__main__.py
+++ b/aider_gitea/__main__.py
@@ -45,7 +45,7 @@ def create_aider_command(issue: str) -> list[str]:
           '--no-auto-lint',
           '--api-key', secrets.llm_api_key(),
           '--read', 'CONVENTIONS.md',
-          '--message', "First, write unit tests that validate your changes. Then, solve the issue. Issue details:\n" + issue,
+          '--message', issue + "\n\n# Solution Details\nFirst, write unit tests that validate your changes. Then, solve the issue.",
           '--yes-always',
           '--architect',
     ]
@@ -111,7 +111,7 @@ def push_changes(cwd: Path, branch_name: str, issue_number: str, issue_title: st
         "-o",
         f"title={issue_title}",
         "-o",
-        f"description=\"This pull request resolves #{issue_number}\""
+        f"description=This pull request resolves #{issue_number}"
     ]
     run_cmd(cmd, cwd)