diff --git a/safeDispatch/src/main/java/com/safemobile/safedispatch/MessagesActivity.java b/safeDispatch/src/main/java/com/safemobile/safedispatch/MessagesActivity.java
index 61c4852..952c7e6 100644
--- a/safeDispatch/src/main/java/com/safemobile/safedispatch/MessagesActivity.java
+++ b/safeDispatch/src/main/java/com/safemobile/safedispatch/MessagesActivity.java
@@ -167,6 +167,8 @@ public class MessagesActivity extends Activity {
 		// button send message
 		imageButtonSend = findViewById(R.id.imageButtonSend);
 		imageButtonSend.setOnClickListener(v -> {
+			if (editTextMsg.getText().toString().isEmpty())
+				return;
 			sendSMS(getScId(), editTextMsg.getText().toString());
 			Toast.makeText(context, "Sending message...", Toast.LENGTH_SHORT).show();
 			// disable send button and editBox
diff --git a/safeDispatch/src/main/java/com/safemobile/safedispatch/TabLayoutActivity.java b/safeDispatch/src/main/java/com/safemobile/safedispatch/TabLayoutActivity.java
index 9abc2cc..6686bee 100644
--- a/safeDispatch/src/main/java/com/safemobile/safedispatch/TabLayoutActivity.java
+++ b/safeDispatch/src/main/java/com/safemobile/safedispatch/TabLayoutActivity.java
@@ -1225,7 +1225,8 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 			image.setImageResource(AppParams.DEMO ? R.drawable.icon_demo : R.mipmap.ic_launcher);
 			TextView text = dialog.findViewById(R.id.text);
 			TextView text2 = dialog.findViewById(R.id.text2);
-			text.setText(String.format("%s1.0.8", getString(R.string.version)));
+			text.setText(getString(R.string.version) + " " + BuildConfig.VERSION_NAME);
+
 			text2.setText(String.format("%s: support@safemobile.com", getString(R.string.email)));
 			dialog.setCancelable(true);
 			dialog.setCanceledOnTouchOutside(true);