diff --git a/resources/views/customers/partials/edit_form.blade.php b/resources/views/customers/partials/edit_form.blade.php
index f402d00..bf8d278 100644
--- a/resources/views/customers/partials/edit_form.blade.php
+++ b/resources/views/customers/partials/edit_form.blade.php
@@ -17,10 +17,18 @@
 								<div>
 									<div class="input-group input-group-flex input-sized-lg">
 										<select class="form-control" name="mailbox" required>
-											<!-- TODO: Automatically select the Mailbox currently set, if there is one. -->
-											<option value="" disabled selected>---</option>
+											@if($customer->mailbox_id == null)
+												<option value="" disabled selected>---</option>
+											@endif
 											@foreach($mailboxes as $mailbox)
-												<option value="{{ $mailbox->id }}">{{ $mailbox->name }}</option>
+												<option
+													value="{{ $mailbox->id }}"
+													@if($mailbox->id == $customer->mailbox_id)
+														selected
+													@endif
+												>
+													{{ $mailbox->name }}
+												</option>
 											@endforeach
 										</select>
 									</div>