diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/ServerConnection.h b/headers/private/mail/ServerConnection.h
similarity index 100%
rename from src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/ServerConnection.h
rename to headers/private/mail/ServerConnection.h
diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile b/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile
index 9dec9bb404..9c2e7431fe 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile
+++ b/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile
@@ -27,26 +27,13 @@ local sources =
 	IMAPParser.cpp
 	IMAPProtocol.cpp
 	IMAPStorage.cpp
-	ServerConnection.cpp
 ;
 
-# use OpenSSL, if enabled
-if $(HAIKU_OPENSSL_ENABLED) {
-	SubDirC++Flags -DUSE_SSL ;
-	SubDirSysHdrs $(HAIKU_OPENSSL_HEADERS) ;
-	Includes [ FGristFiles $(sources) ] : $(HAIKU_OPENSSL_HEADERS_DEPENDENCY) ;
-		# Dependency needed to trigger downloading/unzipping the package before
-		# compiling the files.
-	SetupFeatureObjectsDir ssl ;
-} else {
-	SetupFeatureObjectsDir no-ssl ;
-}
-
 Addon IMAP
 	:
 	$(sources)
 	:
-	be libmail.so $(TARGET_NETWORK_LIBS) $(HAIKU_OPENSSL_LIBS) libalm.so
+	be libmail.so $(TARGET_NETWORK_LIBS) libalm.so
 		libshared.a $(TARGET_LIBSUPC++) $(TARGET_LIBSTDC++)
 ;
 
diff --git a/src/kits/mail/Jamfile b/src/kits/mail/Jamfile
index 19f1351526..0ea5acb037 100644
--- a/src/kits/mail/Jamfile
+++ b/src/kits/mail/Jamfile
@@ -11,7 +11,8 @@ SubDirC++Flags -D_BUILDING_mail=1 ;
 
 UsePrivateHeaders textencoding ;
 
-SharedLibrary libmail.so :
+
+local sources =
 	c_mail_api.cpp
 	crypt.cpp
 	des.c
@@ -29,7 +30,26 @@ SharedLibrary libmail.so :
 	NodeMessage.cpp
 	numailkit.cpp
 	ProtocolConfigView.cpp
+	ServerConnection.cpp
 	StringList.cpp
+;
+
+
+# use OpenSSL, if enabled
+if $(HAIKU_OPENSSL_ENABLED) {
+	SubDirC++Flags -DUSE_SSL ;
+	SubDirSysHdrs $(HAIKU_OPENSSL_HEADERS) ;
+	Includes [ FGristFiles $(sources) ] : $(HAIKU_OPENSSL_HEADERS_DEPENDENCY) ;
+		# Dependency needed to trigger downloading/unzipping the package before
+		# compiling the files.
+	SetupFeatureObjectsDir ssl ;
+} else {
+	SetupFeatureObjectsDir no-ssl ;
+}
+
+
+SharedLibrary libmail.so :
+	$(sources)
 	:
 	be
 	libtextencoding.so
@@ -37,4 +57,5 @@ SharedLibrary libmail.so :
 	$(TARGET_LIBSTDC++)
 	$(TARGET_NETWORK_LIBS)
 	$(TARGET_SELECT_UNAME_ETC_LIB)
+	$(HAIKU_OPENSSL_LIBS)
 ;
diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/ServerConnection.cpp b/src/kits/mail/ServerConnection.cpp
similarity index 100%
rename from src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/ServerConnection.cpp
rename to src/kits/mail/ServerConnection.cpp