diff --git a/app/Http/Controllers/GuestbookController.php b/app/Http/Controllers/GuestbookController.php
index ab00a11..4c40405 100644
--- a/app/Http/Controllers/GuestbookController.php
+++ b/app/Http/Controllers/GuestbookController.php
@@ -35,14 +35,20 @@ public function addEntry(Request $request): RedirectResponse {
             ->from(new Address("wah@wah.moe", "wah dot moe"))
             ->to(new Address("roscoe@wah.moe", "Roscoe D. Wah"))
             ->subject("New Guestbook Entry!")
+            ->category("Guestbook entry")
             ->html('
-<style> td { padding: 5px } </style>
+<style> td { padding: 5px; vertical-align: top } </style>
 <table border="1">
 <tr><td><b>Name:</b></td><td>'.htmlentities($newEntry->name).'</td></tr>
 <tr><td><b>IP:</b></td><td>'.$newEntry->ip.'</td></tr>
 <tr><td><b>Agent:</b></td><td>'.htmlentities($newEntry->agent).'</td></tr>
 <tr><td><b>Message:</b></td><td>'.htmlentities($newEntry->message).'</td></tr>
-</table>');
+</table>')
+            ->text('Name: '.htmlentities($newEntry->name).
+                'IP: '.$newEntry->ip.
+                'Agent: '.htmlentities($newEntry->agent).
+                'Message: '.htmlentities($newEntry->message)
+            );
 
         MailtrapClient::initSendingEmails(
             apiKey: config('services.mailtrap-sdk.apiKey')
diff --git a/app/Models/GuestbookEntry.php b/app/Models/GuestbookEntry.php
index fda1c4b..96d5529 100644
--- a/app/Models/GuestbookEntry.php
+++ b/app/Models/GuestbookEntry.php
@@ -25,7 +25,7 @@ public static function create(Request $request): GuestbookEntry {
         $newEntry = new GuestbookEntry;
         $newEntry->name = $request->get('name');
         $newEntry->message = $request->get('message');
-        $newEntry->ip = $request->header('X-Forwarded-For') ?: $request->ip();
+        $newEntry->ip = $request->header('X-Pandur-IP') ?: $request->ip();
         $newEntry->agent = $request->userAgent();
         $newEntry->flagged = true;
         $newEntry->save();