diff --git a/app/src/main/assets/CoGoTooltips b/app/src/main/assets/CoGoTooltips
index 0bdf9639af..c8beb9a06d 160000
--- a/app/src/main/assets/CoGoTooltips
+++ b/app/src/main/assets/CoGoTooltips
@@ -1 +1 @@
-Subproject commit 0bdf9639aff16c2c91904ad31d5524ff1a527157
+Subproject commit c8beb9a06d36ac86932ec038a4c31fc2437a4563
diff --git a/app/src/main/java/com/itsaky/androidide/fragments/MainFragment.kt b/app/src/main/java/com/itsaky/androidide/fragments/MainFragment.kt
index 64d5c8f98d..3b7e6ddaba 100644
--- a/app/src/main/java/com/itsaky/androidide/fragments/MainFragment.kt
+++ b/app/src/main/java/com/itsaky/androidide/fragments/MainFragment.kt
@@ -12,8 +12,8 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.core.text.HtmlCompat
 import androidx.fragment.app.viewModels
-import org.adfa.constants.FEEDBACK_EMAIL
 import com.google.android.material.progressindicator.LinearProgressIndicator
+import com.itsaky.androidide.BuildConfig
 import com.itsaky.androidide.R
 import com.itsaky.androidide.activities.MainActivity
 import com.itsaky.androidide.activities.PreferencesActivity
@@ -24,6 +24,7 @@ import com.itsaky.androidide.app.BaseIDEActivity
 import com.itsaky.androidide.common.databinding.LayoutDialogProgressBinding
 import com.itsaky.androidide.databinding.FragmentMainBinding
 import com.itsaky.androidide.idetooltips.IDETooltipDatabase
+import com.itsaky.androidide.idetooltips.IDETooltipItem
 import com.itsaky.androidide.models.MainScreenAction
 import com.itsaky.androidide.preferences.databinding.LayoutDialogTextInputBinding
 import com.itsaky.androidide.preferences.internal.GITHUB_PAT
@@ -48,8 +49,6 @@ import org.slf4j.LoggerFactory
 import java.io.File
 import java.text.MessageFormat
 import java.util.concurrent.CancellationException
-import com.itsaky.androidide.BuildConfig
-import com.itsaky.androidide.idetooltips.IDETooltipItem
 
 class MainFragment : BaseFragment() {
 
@@ -168,7 +167,8 @@ class MainFragment : BaseFragment() {
                 .setNegativeButton(android.R.string.cancel) { dialog, _ -> dialog.dismiss() }
                 .setPositiveButton(android.R.string.ok) { dialog, _ ->
                     run {
-                        val stackTrace = Exception().stackTrace.asList().toString().replace(",", "\n")
+                        val stackTrace =
+                            Exception().stackTrace.asList().toString().replace(",", "\n")
 
                         val feedbackMessage = getString(
                             R.string.feedback_message,
@@ -186,7 +186,7 @@ class MainFragment : BaseFragment() {
                         feedbackIntent.type = "text/plain"
                         feedbackIntent.putExtra(
                             Intent.EXTRA_EMAIL,
-                            arrayOf(FEEDBACK_EMAIL)
+                            arrayOf(R.string.feeback_email)
                         )
                         feedbackIntent.putExtra(Intent.EXTRA_SUBJECT, subject)
                         feedbackIntent.putExtra(Intent.EXTRA_TEXT, feedbackMessage)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ce287572c8..6d1b8f88c1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -117,4 +117,5 @@ Connected to the target VM, address: \'localhost:46423\', transport: \'socket\'
     <string name="more_label">More</string>
     <string name="send_email">Send Email</string>
     <string name="close">Close</string>
+    <string name="feeback_email">feedback@appdevforall.org</string>
 </resources>
\ No newline at end of file
diff --git a/composite-builds/build-deps-common/constants/src/main/java/org/adfa/constants/constants.kt b/composite-builds/build-deps-common/constants/src/main/java/org/adfa/constants/constants.kt
index 740a771f32..255d5999a2 100644
--- a/composite-builds/build-deps-common/constants/src/main/java/org/adfa/constants/constants.kt
+++ b/composite-builds/build-deps-common/constants/src/main/java/org/adfa/constants/constants.kt
@@ -152,10 +152,6 @@ const val CONTENT_KEY = "CONTENT_KEY"
 // Toml
 const val TOML_FILE_NAME = "libs.versions.toml"
 
-//Email constant
-const val FEEDBACK_EMAIL = "feedback@appdevforall.com"
-
-
 // Help
 const val HELP_PAGE_URL =
     "file:///android_asset/CoGoTooltips/html/cogohelp/index.html"