diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 34539bee77..0ea8f5925e 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -381,7 +381,7 @@ local spellFiles = words geekspeak ;
 spellFiles = $(spellFiles:G=spell) ;
 SEARCH on $(spellFiles)
 	= [ FDirName $(HAIKU_TOP) src apps mail ] ;
-AddFilesToHaikuImage common etc word_dictionary : $(spellFiles) ;
+AddFilesToHaikuImage system data spell_check word_dictionary : $(spellFiles) ;
 
 # Locale kit language files
 local languageDir = [ FDirName $(HAIKU_TOP) src data locale languages ] ;
diff --git a/src/apps/mail/MailApp.cpp b/src/apps/mail/MailApp.cpp
index d914a86e85..d77020ed9e 100644
--- a/src/apps/mail/MailApp.cpp
+++ b/src/apps/mail/MailApp.cpp
@@ -479,7 +479,8 @@ TMailApp::ReadyToRun()
 	BEntry entry;
 
 	// Locate user settings directory
-	find_directory(B_BEOS_ETC_DIRECTORY, &indexDir, true);
+	find_directory(B_SYSTEM_DATA_DIRECTORY, &indexDir, true);
+	indexDir.Append("spell_check");
 	dictionaryDir = indexDir;
 
 	// Setup directory paths