diff --git a/core/src/test/java/org/solovyev/android/calculator/CalculatorMessagesTest.java b/core/src/test/java/org/solovyev/android/calculator/CalculatorMessagesTest.java
new file mode 100644
index 00000000..4d7c6b51
--- /dev/null
+++ b/core/src/test/java/org/solovyev/android/calculator/CalculatorMessagesTest.java
@@ -0,0 +1,66 @@
+package org.solovyev.android.calculator;
+
+import org.junit.Test;
+import org.solovyev.common.msg.MessageType;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+
+import javax.annotation.Nonnull;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class CalculatorMessagesTest {
+
+	private static final Locale[] LOCALES = new Locale[]{
+			Locale.ENGLISH, new Locale("ar"), new Locale("cs"), new Locale("de"), new Locale("es"), new Locale("es", "ES"), new Locale("fi"), new Locale("fr"), new Locale("it"), new Locale("ja"), new Locale("nl"), new Locale("pl"),
+			new Locale("pt", "BR"), new Locale("pt", "PT"),
+			new Locale("ru"), new Locale("uk"), new Locale("vi"), new Locale("zh"), new Locale("zh", "CN"), new Locale("zh", "TW")
+	};
+
+	private static final String[] MESSAGES = new String[]{CalculatorMessages.msg_001,
+			CalculatorMessages.msg_002,
+			CalculatorMessages.msg_003,
+			CalculatorMessages.msg_004,
+			CalculatorMessages.msg_005,
+			CalculatorMessages.msg_006,
+			CalculatorMessages.msg_007,
+			CalculatorMessages.syntax_error,
+			CalculatorMessages.result_copied,
+			CalculatorMessages.text_copied,
+			CalculatorMessages.ans_description};
+
+	@Test
+	public void testAllMessages() throws Exception {
+		for (String id : MESSAGES) {
+			final List<String> arguments = makeMessageArguments(id);
+			final CalculatorMessage message = new CalculatorMessage(id, MessageType.info, arguments);
+			for (Locale locale : LOCALES) {
+				final String text = message.getLocalizedMessage(locale);
+				assertFalse(text.isEmpty());
+				if (arguments.size() == 1) {
+					assertTrue(text.contains("param0"));
+				} else if (arguments.size() == 2) {
+					assertTrue(text.contains("param1"));
+					assertTrue(text.contains("param2"));
+				}
+			}
+
+		}
+
+	}
+
+	@Nonnull
+	private List<String> makeMessageArguments(@Nonnull String id) {
+		switch (id) {
+			case "1":
+			case "5":
+			case "7":
+				return Arrays.asList("param0");
+		}
+		return Collections.emptyList();
+	}
+}