diff --git a/headers/os/mail/MailSettings.h b/headers/os/mail/MailSettings.h
index af5e814ed5..443f1601da 100644
--- a/headers/os/mail/MailSettings.h
+++ b/headers/os/mail/MailSettings.h
@@ -39,6 +39,9 @@ typedef enum
 } b_mail_status_window_look;
 
 
+#define kDefaultSentDirectory "/boot/home/mail/sent"
+
+
 class BMailSettings {
 public:
 								BMailSettings();
diff --git a/headers/private/mail/FileConfigView.h b/headers/private/mail/FileConfigView.h
index ef13597d2e..42b30e39b5 100644
--- a/headers/private/mail/FileConfigView.h
+++ b/headers/private/mail/FileConfigView.h
@@ -9,6 +9,7 @@
 #include <View.h>
 #include <FilePanel.h>
 
+
 class BTextControl;
 class BButton;
 
diff --git a/src/add-ons/mail_daemon/outbound_protocols/smtp/ConfigView.cpp b/src/add-ons/mail_daemon/outbound_protocols/smtp/ConfigView.cpp
index 854d9f15fe..d46048df1f 100644
--- a/src/add-ons/mail_daemon/outbound_protocols/smtp/ConfigView.cpp
+++ b/src/add-ons/mail_daemon/outbound_protocols/smtp/ConfigView.cpp
@@ -71,7 +71,7 @@ SMTPConfigView::SMTPConfigView(MailAddonSettings& settings,
 	SetTo(settings);
 
 	fFileView =  new BMailFileConfigView("Destination:", "destination",
-		false, "/boot/home/mail/out");
+		false, kDefaultSentDirectory);
 	fFileView->SetTo(&settings.Settings(), NULL);
 	AddChild(fFileView);
 	float w, h;
diff --git a/src/kits/mail/HaikuMailFormatFilter.cpp b/src/kits/mail/HaikuMailFormatFilter.cpp
index 9bb086757f..f1a8ae2f1c 100644
--- a/src/kits/mail/HaikuMailFormatFilter.cpp
+++ b/src/kits/mail/HaikuMailFormatFilter.cpp
@@ -54,6 +54,7 @@ HaikuMailFormatFilter::HaikuMailFormatFilter(MailProtocol& protocol,
 	fAccountId(settings->AccountID())
 {
 	const BMessage* outboundSettings = &settings->OutboundSettings().Settings();
+	fOutboundDirectory = kDefaultSentDirectory;
 	outboundSettings->FindString("destination", &fOutboundDirectory);
 }