diff --git a/components/translation/translation.cpp b/components/translation/translation.cpp
index fb5b03861..002446e4f 100644
--- a/components/translation/translation.cpp
+++ b/components/translation/translation.cpp
@@ -50,10 +50,7 @@ namespace Translation
 
             if (!line.empty())
             {
-                char* buffer = ToUTF8::getBuffer(line.size() + 1);
-                //buffer has at least line.size() + 1 bytes, so it must be safe
-                strcpy(buffer, line.c_str());
-                line = ToUTF8::getUtf8(mEncoding);
+                line = mEncoder.getUtf8(line);
 
                 size_t tab_pos = line.find('\t');
                 if (tab_pos != std::string::npos && tab_pos > 0 && tab_pos < line.size() - 1)
@@ -107,6 +104,7 @@ namespace Translation
     void Storage::setEncoding (const ToUTF8::FromType& encoding)
     {
         mEncoding = encoding;
+        mEncoder.setEncoding(encoding);
     }
 
     bool Storage::hasTranslation() const
diff --git a/components/translation/translation.hpp b/components/translation/translation.hpp
index 80d44d871..6c3e4df86 100644
--- a/components/translation/translation.hpp
+++ b/components/translation/translation.hpp
@@ -35,6 +35,7 @@ namespace Translation
 
 
         ToUTF8::FromType mEncoding;
+        ToUTF8::Utf8Encoder mEncoder;
         ContainerType mCellNamesTranslations, mTopicIDs, mPhraseForms;
     };
 }